Skip to content

Commit

Permalink
Merge pull request #1 from Daniel09Fernandes/master
Browse files Browse the repository at this point in the history 
Ajuste na adição de bordas
  • Loading branch information
@Daniel09Fernandes
Daniel09Fernandes authored Mar 26, 2022
2 parents 9484bef + fea7274 commit 84ece02
Show file tree
Hide file tree
Showing 11 changed files with 1,610 additions and 128 deletions.
Binary file modified Demo/DemoDinoOpenOffice.identcache
View file
Binary file not shown.
13 changes: 2 additions & 11 deletions Demo/Unit1.dfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,16 +487,7 @@ object Form1: TForm1
OnClick = BitBtn2Click
end
object OpenOffice1: TOpenOffice
OnBeforeStartSheet = OpenOffice1BeforeStartSheet
OnAfterStartSheet = OpenOffice1AfterStartSheet
OnBeforeCloseSheet = OpenOffice1BeforeCloseSheet
OnAfterCloseSheet = OpenOffice1AfterCloseSheet
OnBeforePrint = OpenOffice1BeforePrint
OnBeforeGetValue = OpenOffice1BeforeGetValue
OnAfterGetValue = OpenOffice1AfterGetValue
OnBeforeSetValue = OpenOffice1BeforeSetValue
OnAfterSetValue = OpenOffice1AfterSetValue
Left = 488
Top = 184
Left = 496
Top = 192
end
end
28 changes: 15 additions & 13 deletions Demo/Unit1.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,23 +136,25 @@ procedure TForm1.Button1Click(Sender: TObject);
OpenOffice1.startSheet;

OpenOffice1.SetValue(1,'A', 'STATUS')
.SetBorder([bAll], opBrown)
.changeJustify( fthRIGHT , ftvTOP)
.setBold(true)
.changeFont('Arial',12)
.SetUnderline(true)
.setColor( opWhite ,opMagenta);

OpenOffice1.SetValue(1,'B', 'VALOR').changeJustify( fthRIGHT , ftvTOP)
.SetBorder([bAll], opBrown)
.setBold(true)
.changeFont('Arial',12)
.SetUnderline(true)
.setColor( opWhite ,opMagenta);

OpenOffice1.SetValue(2,'B', 109, ftNumeric);
OpenOffice1.SetValue(2,'A', 'AGUA');
OpenOffice1.SetValue(2,'B', 109, ftNumeric).SetBorder([bAll], opBrown);
OpenOffice1.SetValue(2,'A', 'AGUA').SetBorder([bAll], opBrown);

OpenOffice1.SetValue(3,'B', 105.55, ftNumeric);
OpenOffice1.SetValue(3,'A', 'LUZ');
OpenOffice1.SetValue(3,'B', 105.55, ftNumeric).SetBorder([bAll], opBrown);
OpenOffice1.SetValue(3,'A', 'LUZ').SetBorder([bAll], opBrown);

OpenOffice1.SetValue(4,'B', 1005.22, ftNumeric);
OpenOffice1.SetValue(4,'A', 'ALUGUEL');
Expand All @@ -167,33 +169,33 @@ procedure TForm1.Button1Click(Sender: TObject);
OpenOffice1.addNewSheet('A Receber',1);

OpenOffice1.SetValue(1,'A', 'VALOR')
.SetBorder([bAll], opBrown)
.changeJustify( fthRIGHT , ftvTOP)
.setBold(true)
.addBorder([bAll], opBrown);
.setBold(true);

OpenOffice1.SetValue(1,'B', 'DESC')
.SetBorder([bAll], opBrown)
.changeJustify( fthRIGHT , ftvTOP)
.setBold(true)
.changeFont('Arial',12)
.SetUnderline(true)
.setColor( opWhite ,opCiano)
.addBorder([bAll], opBrown);
.setColor( opWhite ,opCiano);

OpenOffice1.SetValue(1,'C', 'SOMA')
.SetBorder([bAll], opBrown)
.changeJustify( fthRIGHT , ftvTOP)
.setBold(true)
.changeFont('Arial',12)
.SetUnderline(true)
.setColor( opWhite ,opSoftRed)
.addBorder([bAll], opBrown);
.setColor( opWhite ,opSoftRed);

OpenOffice1.SetValue(1,'H', 'SOMA')
.SetBorder([bAll], opBrown)
.changeJustify( fthRIGHT , ftvTOP)
.setBold(true)
.changeFont('Arial',12)
.SetUnderline(true)
.setColor( opWhite ,opSoftRed)
.addBorder([bAll], opBrown);
.setColor( opWhite ,opSoftRed);

OpenOffice1.SetValue(2,'A', 200, ftNumeric);
OpenOffice1.SetValue(2,'B', 'Emprestimo');
Expand Down Expand Up @@ -293,7 +295,7 @@ procedure TForm1.Button6Click(Sender: TObject);
.setColor(TOpenColor( CBCorFont.Items.Objects[ CBCorFont.ItemIndex]),TOpenColor( CBCorFundo.Items.Objects[ CBCorFundo.ItemIndex]))
.changeFont(cbFontes.Text,edtTamanhoFonte.ValueInt)
.changeJustify(jusH,jusV)
.addBorder([bAll], opBlack);
.SetBorder([bAll], opBlack);
end;

procedure TForm1.Button7Click(Sender: TObject);
Expand Down
103 changes: 13 additions & 90 deletions OpenOffice_Calc.dproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
<Base_Android64>true</Base_Android64>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
<Base_iOSDevice64>true</Base_iOSDevice64>
<CfgParent>Base</CfgParent>
Expand All @@ -33,11 +28,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Base)'=='true') or '$(Base_OSX64)'!=''">
<Base_OSX64>true</Base_OSX64>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
Expand Down Expand Up @@ -90,17 +80,6 @@
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
<Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Android64)'!=''">
<VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=</VerInfo_Keys>
<BT_BuildType>Debug</BT_BuildType>
<Base_Android>true</Base_Android>
<CfgParent>Base</CfgParent>
<Base>true</Base>
<DCC_UsePackage>rtl;xmlrtl;dbrtl;inet;$(DCC_UsePackage);$(DCC_UsePackage)</DCC_UsePackage>
<EnabledSysJars>android-support-v4.dex.jar;apk-expansion.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar</EnabledSysJars>
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
<Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
<DCC_UsePackage>rtl;xmlrtl;dbrtl;inet;$(DCC_UsePackage)</DCC_UsePackage>
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
Expand All @@ -110,14 +89,6 @@
<DCC_UsePackage>rtl;xmlrtl;dbrtl;inet;$(DCC_UsePackage)</DCC_UsePackage>
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_OSX64)'!=''">
<VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple&apos;s speech recognition servers</VerInfo_Keys>
<BT_BuildType>Debug</BT_BuildType>
<Base_OSX32>true</Base_OSX32>
<CfgParent>Base</CfgParent>
<Base>true</Base>
<DCC_UsePackage>rtl;xmlrtl;dbrtl;inet;inetdb;$(DCC_UsePackage);$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
<DCC_UsePackage>rtl;xmlrtl;vcl;dbrtl;inet;inetdb;$(DCC_UsePackage)</DCC_UsePackage>
Expand Down Expand Up @@ -194,70 +165,24 @@
<Source Name="MainSource">OpenOffice_Calc.dpk</Source>
</Source>
<Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k230.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp230.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality>
<Deployment Version="3">
<DeployFile LocalName="$(BDS)\Redist\Win32\dbrtl270.bpl" Configuration="Debug" Class="DependencyPackage">
<Platform Name="Win32">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\OpenOffice_Calc.bpl" Configuration="Release" Class="ProjectOutput">
<Platform Name="Win32">
<RemoteName>OpenOffice_Calc.bpl</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\17.0\Bpl\pkg_openOffice.bpl" Configuration="Debug" Class="ProjectOutput"/>
<DeployFile LocalName="$(BDS)\Redist\Win32\xmlrtl270.bpl" Configuration="Debug" Class="DependencyPackage">
<Platform Name="Win32">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule"/>
<DeployFile LocalName="$(BDS)\Redist\Win32\rtl270.bpl" Configuration="Debug" Class="DependencyPackage">
<Platform Name="Win32">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">
<Platform Name="iOSSimulator">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
<Platform Name="iOSSimulator">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\Redist\Win32\inetdb270.bpl" Configuration="Debug" Class="DependencyPackage">
<Platform Name="Win32">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
<Platform Name="OSX32">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\Redist\Win32\inet270.bpl" Configuration="Debug" Class="DependencyPackage">
<Platform Name="Win32">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\OpenOffice_Calc.bpl" Configuration="Debug" Class="ProjectOutput">
<Platform Name="Win32">
<RemoteName>OpenOffice_Calc.bpl</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\Redist\Win32\vcl270.bpl" Configuration="Debug" Class="DependencyPackage">
<Platform Name="Win32">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule"/>
<DeployFile LocalName="$(BDS)\Redist\Win32\dbrtl270.bpl" Configuration="Debug" Class="DependencyPackage"/>
<DeployFile LocalName="$(BDS)\Redist\Win32\xmlrtl270.bpl" Configuration="Debug" Class="DependencyPackage"/>
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule"/>
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\OpenOffice_Calc.bpl" Configuration="Release" Class="ProjectOutput"/>
<DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule"/>
<DeployFile LocalName="$(BDS)\Redist\Win32\inet270.bpl" Configuration="Debug" Class="DependencyPackage"/>
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\OpenOffice_Calc.bpl" Configuration="Debug" Class="ProjectOutput"/>
<DeployFile LocalName="$(BDS)\Redist\Win32\inetdb270.bpl" Configuration="Debug" Class="DependencyPackage"/>
<DeployFile LocalName="$(BDS)\Redist\Win32\rtl270.bpl" Configuration="Debug" Class="DependencyPackage"/>
<DeployFile LocalName="$(BDS)\Redist\Win32\vcl270.bpl" Configuration="Debug" Class="DependencyPackage"/>
<DeployClass Name="AdditionalDebugSymbols">
<Platform Name="OSX32">
<Operation>1</Operation>
Expand Down Expand Up @@ -953,10 +878,8 @@
</Deployment>
<Platforms>
<Platform value="Android">False</Platform>
<Platform value="Android64">False</Platform>
<Platform value="iOSDevice64">False</Platform>
<Platform value="iOSSimulator">False</Platform>
<Platform value="OSX64">False</Platform>
<Platform value="Win32">True</Platform>
<Platform value="Win64">False</Platform>
</Platforms>
Expand Down
4 changes: 2 additions & 2 deletions OpenOffice_Calc.dproj.local
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<Transaction>2022/02/15 20:02:50.000.900,E:\Daniel\fontes\package_OpenOffice\required\uTest.pas=</Transaction>
<Transaction>2022/02/15 20:05:12.000.344,=E:\Daniel\fontes\package_OpenOffice\uOpenOffice.pas</Transaction>
<Transaction>2022/02/15 20:13:34.000.641,=vcl.dcp</Transaction>
<Transaction>2022/02/15 20:13:34.000.656,=inetdb.dcp</Transaction>
<Transaction>2022/02/15 20:13:34.000.646,=dbrtl.dcp</Transaction>
<Transaction>2022/02/15 20:13:34.000.650,=inet.dcp</Transaction>
<Transaction>2022/02/15 20:13:34.000.656,=inetdb.dcp</Transaction>
<Transaction>2022/02/15 20:13:34.000.638,=xmlrtl.dcp</Transaction>
<Transaction>2022/02/15 20:13:34.000.646,=dbrtl.dcp</Transaction>
<Transaction>2022/02/16 19:01:54.000.896,=E:\Daniel\fontes\package_OpenOffice\Src\uOpenOfficeCollors.pas</Transaction>
<Transaction>2022/02/16 19:01:54.000.923,=E:\Daniel\fontes\package_OpenOffice\Src\uOpenOfficeHelper.pas</Transaction>
<Transaction>2022/02/16 19:01:54.000.870,=E:\Daniel\fontes\package_OpenOffice\Src\uOpenOffice.pas</Transaction>
Expand Down
Loading

0 comments on commit 84ece02

Please sign in to comment.