You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/05/18 12:12:56 UTC
svn commit: r1484083 [5/17] - in /openoffice/branches/ia2: ./
ext_libraries/apr/prj/ ext_libraries/coinmp/prj/ ext_libraries/ratscan/prj/
ext_libraries/serf/prj/ main/ main/avmedia/source/quicktime/
main/bridges/prj/ main/bridges/source/cpp_uno/cxx_mac...
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/LightBulb-Standard-Off2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/LightBulb-Standard-On.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/Pollution-Car.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/Pollution-Factory.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/Raindrop.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/RecycleBin.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/RecycleSymbol.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/RenewableEnergy-Solar.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/RenewableEnergy-Water.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/RenewableEnergy-Wind.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/RenewableEnergySymbol.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/Sun1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/Sun2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/ATM01.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/ATM02.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Agreement.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Balance-Balanced1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Balance-Balanced2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Balance-Unbalanced1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Balance-Unbalanced2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Calculator.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Chart-Decrease1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Chart-Decrease2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Chart-Increase1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Chart-Increase2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Chart-Plateau.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Check.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Contract.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/CreditCard-Black.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/CreditCard-Cut.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/CreditCard-Gold.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Currency-Dollar.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Currency-Dollars.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Currency-Stack.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Currency-StackCoins.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/GoldBar-Stack.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/GoldBar.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/MoneyBag01.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/MoneyBag02.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/PercentSign.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/PiggyBank-Coins.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/PiggyBank-Currency.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/PiggyBank01-Broken.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/PiggyBank02-Broken.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Portfolio.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/PriceTag.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Safe-Closed.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Safe-Empty.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Safe-Full.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Seal-Gold.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Seal-Red.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Seal-Silver.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Wallet-Empty.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Wallet-Full1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/finance/Wallet-Full2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Artist-Female1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Artist-Female2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Artist-Male1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Artist-Male2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/BusinessPerson-Female1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/BusinessPerson-Female2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/BusinessPerson-Female3.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/BusinessPerson-Female4.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/BusinessPerson-Female5.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/BusinessPerson-Female6.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/BusinessPerson-HeadSet1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/BusinessPerson-HeadSet2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/BusinessPerson-Male1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/BusinessPerson-Male2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/BusinessPerson-Male3.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/BusinessPerson-Male4.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/BusinessPerson-Male5.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/BusinessPerson-Male6.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Chef1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Chef2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Computer-User-Female1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Computer-User-Female2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Computer-User-Male1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Computer-User-Male2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/ConstructionWorker.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/ConstructionWorker2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Detective1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Detective2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Doctor-Female1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Doctor-Female2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Doctor-Male1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Doctor-Male2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Nurse1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Nurse2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/PoliceOfficer1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/PoliceOfficer2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Presenter-Female1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Presenter-Female2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Presenter-Male1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Presenter-Male2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Student-Female.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Student-Male.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Surgeon-Female1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Surgeon-Female2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Surgeon1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Surgeon2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Teacher1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Teacher2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Tourist-Female1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Tourist-Female2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Tourist-Male1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/people/Tourist-Male2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/transportation/Airplane-Blue.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/transportation/Bicycle-Blue.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/transportation/Boat.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/transportation/Bus.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/transportation/Canoe-Blue.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/transportation/Car-Red.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/transportation/Helicopter-Blue.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/transportation/Motorcycle-Red.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/transportation/Pedestrian-Blue.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/transportation/PersonalTransporter-Green.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/transportation/Sailboat-Red.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/transportation/Scooter-Orange.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/transportation/Train-Red.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/transportation/Truck-Blue.png
('svn:executable' removed)
Modified: openoffice/branches/ia2/main/extras/source/palettes/standard.soc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/palettes/standard.soc?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extras/source/palettes/standard.soc (original)
+++ openoffice/branches/ia2/main/extras/source/palettes/standard.soc Sat May 18 10:12:43 2013
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<office:color-table xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script">
- <!-- #121520# use Symphony palette as base, it is organized as groups of twelve entries -->
+ <!-- use Symphony palette as base, it is organized as groups of twelve entries -->
+ <!-- Gray palette from white to black -->
<draw:color draw:name="White" draw:color="#ffffff"/>
<draw:color draw:name="Gray 1" draw:color="#eeeeee"/>
<draw:color draw:name="Gray 2" draw:color="#dddddd"/>
@@ -13,6 +14,8 @@
<draw:color draw:name="Gray 9" draw:color="#1c1c1c"/>
<draw:color draw:name="Gray 10" draw:color="#111111"/>
<draw:color draw:name="Black" draw:color="#000000"/>
+
+ <!-- Base colors step 0 -->
<draw:color draw:name="Yellow" draw:color="#ffff99"/>
<draw:color draw:name="Orange" draw:color="#ff6600"/>
<draw:color draw:name="Red" draw:color="#ff3333"/>
@@ -20,11 +23,13 @@
<draw:color draw:name="Magenta" draw:color="#ff33ff"/>
<draw:color draw:name="Purple" draw:color="#9900ff"/>
<draw:color draw:name="Blue" draw:color="#6666ff"/>
- <draw:color draw:name="Sky Blue" draw:color="#00ccff"/>
+ <draw:color draw:name="Sky blue" draw:color="#00ccff"/>
<draw:color draw:name="Cyan" draw:color="#66ffff"/>
<draw:color draw:name="Turquoise" draw:color="#33ff99"/>
<draw:color draw:name="Green" draw:color="#99ff66"/>
- <draw:color draw:name="Yellow Green" draw:color="#ccff00"/>
+ <draw:color draw:name="Yellow green" draw:color="#ccff00"/>
+
+ <!-- Base colors step 1 -->
<draw:color draw:name="Yellow 1" draw:color="#ffff66"/>
<draw:color draw:name="Orange 1" draw:color="#ffcc00"/>
<draw:color draw:name="Red 1" draw:color="#ff9999"/>
@@ -32,11 +37,13 @@
<draw:color draw:name="Magenta 1" draw:color="#ff99ff"/>
<draw:color draw:name="Purple 1" draw:color="#cc66ff"/>
<draw:color draw:name="Blue 1" draw:color="#9999ff"/>
- <draw:color draw:name="Sky Blue 1" draw:color="#9999ff"/>
+ <draw:color draw:name="Sky blue 1" draw:color="#9999ff"/>
<draw:color draw:name="Cyan 1" draw:color="#99ffff"/>
<draw:color draw:name="Turquoise 1" draw:color="#66ff99"/>
<draw:color draw:name="Green 1" draw:color="#99ff99"/>
- <draw:color draw:name="Yellow Green 1" draw:color="#ccff66"/>
+ <draw:color draw:name="Yellow green 1" draw:color="#ccff66"/>
+
+ <!-- Base colors step 2 -->
<draw:color draw:name="Yellow 2" draw:color="#ffff00"/>
<draw:color draw:name="Orange 2" draw:color="#ff9900"/>
<draw:color draw:name="Red 2" draw:color="#ff6666"/>
@@ -44,11 +51,13 @@
<draw:color draw:name="Magenta 2" draw:color="#ff66ff"/>
<draw:color draw:name="Purple 2" draw:color="#9933ff"/>
<draw:color draw:name="Blue 2" draw:color="#3333ff"/>
- <draw:color draw:name="Sky Blue 2" draw:color="#3399ff"/>
+ <draw:color draw:name="Sky blue 2" draw:color="#3399ff"/>
<draw:color draw:name="Cyan 2" draw:color="#00ffff"/>
<draw:color draw:name="Turquoise 2" draw:color="#00ff66"/>
<draw:color draw:name="Green 2" draw:color="#66ff66"/>
- <draw:color draw:name="Yellow Green 2" draw:color="#99ff33"/>
+ <draw:color draw:name="Yellow green 2" draw:color="#99ff33"/>
+
+ <!-- Base colors step 3 -->
<draw:color draw:name="Yellow 3" draw:color="#cc9900"/>
<draw:color draw:name="Orange 3" draw:color="#ff3300"/>
<draw:color draw:name="Red 3" draw:color="#ff0000"/>
@@ -56,11 +65,13 @@
<draw:color draw:name="Magenta 3" draw:color="#ff00ff"/>
<draw:color draw:name="Purple 3" draw:color="#6600ff"/>
<draw:color draw:name="Blue 3" draw:color="#0000ff"/>
- <draw:color draw:name="Sky Blue 3" draw:color="#0066ff"/>
+ <draw:color draw:name="Sky blue 3" draw:color="#0066ff"/>
<draw:color draw:name="Cyan 3" draw:color="#00cccc"/>
<draw:color draw:name="Turquoise 3" draw:color="#00cc33"/>
<draw:color draw:name="Green 3" draw:color="#00cc00"/>
- <draw:color draw:name="Yellow Green 3" draw:color="#66ff00"/>
+ <draw:color draw:name="Yellow green 3" draw:color="#66ff00"/>
+
+ <!-- Base colors step 4 -->
<draw:color draw:name="Yellow 4" draw:color="#996600"/>
<draw:color draw:name="Orange 4" draw:color="#cc3300"/>
<draw:color draw:name="Red 4" draw:color="#cc0000"/>
@@ -68,11 +79,13 @@
<draw:color draw:name="Magenta 4" draw:color="#cc00cc"/>
<draw:color draw:name="Purple 4" draw:color="#6600cc"/>
<draw:color draw:name="Blue 4" draw:color="#0000cc"/>
- <draw:color draw:name="Sky Blue 4" draw:color="#0066cc"/>
+ <draw:color draw:name="Sky blue 4" draw:color="#0066cc"/>
<draw:color draw:name="Cyan 4" draw:color="#009999"/>
<draw:color draw:name="Turquoise 4" draw:color="#009933"/>
<draw:color draw:name="Green 4" draw:color="#009900"/>
- <draw:color draw:name="Yellow Green 4" draw:color="#66cc00"/>
+ <draw:color draw:name="Yellow green 4" draw:color="#66cc00"/>
+
+ <!-- Base colors step 5 -->
<draw:color draw:name="Yellow 5" draw:color="#663300"/>
<draw:color draw:name="Orange 5" draw:color="#801900"/>
<draw:color draw:name="Red 5" draw:color="#990000"/>
@@ -80,11 +93,13 @@
<draw:color draw:name="Magenta 5" draw:color="#990099"/>
<draw:color draw:name="Purple 5" draw:color="#330099"/>
<draw:color draw:name="Blue 5" draw:color="#000099"/>
- <draw:color draw:name="Sky Blue 5" draw:color="#006699"/>
+ <draw:color draw:name="Sky blue 5" draw:color="#006699"/>
<draw:color draw:name="Cyan 5" draw:color="#006666"/>
<draw:color draw:name="Turquoise 5" draw:color="#007826"/>
<draw:color draw:name="Green 5" draw:color="#006600"/>
- <draw:color draw:name="Yellow Green 5" draw:color="#669900"/>
+ <draw:color draw:name="Yellow green 5" draw:color="#669900"/>
+
+ <!-- Base colors step 6 -->
<draw:color draw:name="Yellow 6" draw:color="#333300"/>
<draw:color draw:name="Orange 6" draw:color="#461900"/>
<draw:color draw:name="Red 6" draw:color="#330000"/>
@@ -92,11 +107,13 @@
<draw:color draw:name="Magenta 6" draw:color="#660066"/>
<draw:color draw:name="Purple 6" draw:color="#000033"/>
<draw:color draw:name="Blue 6" draw:color="#000066"/>
- <draw:color draw:name="Sky Blue 6" draw:color="#000080"/>
+ <draw:color draw:name="Sky blue 6" draw:color="#000080"/>
<draw:color draw:name="Cyan 6" draw:color="#003333"/>
<draw:color draw:name="Turquoise 6" draw:color="#00331a"/>
<draw:color draw:name="Green 6" draw:color="#003300"/>
- <draw:color draw:name="Yellow Green 6" draw:color="#193300"/>
+ <draw:color draw:name="Yellow green 6" draw:color="#193300"/>
+
+ <!-- Base colors step 7 -->
<draw:color draw:name="Yellow 7" draw:color="#666633"/>
<draw:color draw:name="Orange 7" draw:color="#661900"/>
<draw:color draw:name="Red 7" draw:color="#663333"/>
@@ -104,11 +121,13 @@
<draw:color draw:name="Magenta 7" draw:color="#663366"/>
<draw:color draw:name="Purple 7" draw:color="#330066"/>
<draw:color draw:name="Blue 7" draw:color="#333366"/>
- <draw:color draw:name="Sky Blue 7" draw:color="#003366"/>
+ <draw:color draw:name="Sky blue 7" draw:color="#003366"/>
<draw:color draw:name="Cyan 7" draw:color="#336666"/>
<draw:color draw:name="Turquoise 7" draw:color="#006633"/>
<draw:color draw:name="Green 7" draw:color="#336633"/>
- <draw:color draw:name="Yellow Green 7" draw:color="#336600"/>
+ <draw:color draw:name="Yellow green 7" draw:color="#336600"/>
+
+ <!-- Base colors step 8 -->
<draw:color draw:name="Yellow 8" draw:color="#999966"/>
<draw:color draw:name="Orange 8" draw:color="#996633"/>
<draw:color draw:name="Red 8" draw:color="#996666"/>
@@ -116,23 +135,27 @@
<draw:color draw:name="Magenta 8" draw:color="#996699"/>
<draw:color draw:name="Purple 8" draw:color="#663399"/>
<draw:color draw:name="Blue 8" draw:color="#666699"/>
- <draw:color draw:name="Sky Blue 8" draw:color="#336699"/>
+ <draw:color draw:name="Sky blue 8" draw:color="#336699"/>
<draw:color draw:name="Cyan 8" draw:color="#669999"/>
<draw:color draw:name="Turquoise 8" draw:color="#339966"/>
<draw:color draw:name="Green 8" draw:color="#669966"/>
- <draw:color draw:name="Yellow Green 8" draw:color="#669933"/>
+ <draw:color draw:name="Yellow green 8" draw:color="#669933"/>
<draw:color draw:name="Yellow 9" draw:color="#cccc99"/>
+
+ <!-- Base colors step 9 -->
<draw:color draw:name="Orange 9" draw:color="#cc9966"/>
<draw:color draw:name="Red 9" draw:color="#cc9999"/>
<draw:color draw:name="Pink 9" draw:color="#cc6699"/>
<draw:color draw:name="Magenta 9" draw:color="#cc99cc"/>
<draw:color draw:name="Purple 9" draw:color="#9966cc"/>
<draw:color draw:name="Blue 9" draw:color="#9999cc"/>
- <draw:color draw:name="Sky Blue 9" draw:color="#6699cc"/>
+ <draw:color draw:name="Sky blue 9" draw:color="#6699cc"/>
<draw:color draw:name="Cyan 9" draw:color="#99cccc"/>
<draw:color draw:name="Turquoise 9" draw:color="#66cc99"/>
<draw:color draw:name="Green 9" draw:color="#99cc99"/>
- <draw:color draw:name="Yellow Green 9" draw:color="#99cc66"/>
+ <draw:color draw:name="Yellow green 9" draw:color="#99cc66"/>
+
+ <!-- Base colors step 10 -->
<draw:color draw:name="Yellow 10" draw:color="#ffffcc"/>
<draw:color draw:name="Orange 10" draw:color="#ffcc99"/>
<draw:color draw:name="Red 10" draw:color="#ffcccc"/>
@@ -140,17 +163,17 @@
<draw:color draw:name="Magenta 10" draw:color="#ffccff"/>
<draw:color draw:name="Purple 10" draw:color="#cc99ff"/>
<draw:color draw:name="Blue 10" draw:color="#ccccff"/>
- <draw:color draw:name="Sky Blue 10" draw:color="#99ccff"/>
+ <draw:color draw:name="Sky blue 10" draw:color="#99ccff"/>
<draw:color draw:name="Cyan 10" draw:color="#ccffff"/>
<draw:color draw:name="Turquoise 10" draw:color="#99ffcc"/>
<draw:color draw:name="Green 10" draw:color="#ccffcc"/>
- <draw:color draw:name="Yellow Green 10" draw:color="#ccff99"/>
+ <draw:color draw:name="Yellow green 10" draw:color="#ccff99"/>
- <!-- #121520# use some 'nice' colors from original palette -->
+ <!-- use some 'nice' colors from original palette -->
<draw:color draw:name="Blue gray" draw:color="#e6e6ff"/>
- <draw:color draw:name="Blue nine" draw:color="#CFE7F5"/>
+ <draw:color draw:name="Blue classic" draw:color="#CFE7F5"/>
- <!-- #121520# add 'pale' colors from original palette -->
+ <!-- add 'pale' colors from original palette -->
<draw:color draw:name="Violet" draw:color="#9999ff"/>
<draw:color draw:name="Bordeaux" draw:color="#993366"/>
<draw:color draw:name="Pale yellow" draw:color="#ffffcc"/>
@@ -159,7 +182,7 @@
<draw:color draw:name="Salmon" draw:color="#ff8080"/>
<draw:color draw:name="Sea blue" draw:color="#0066cc"/>
- <!-- #121520# add Chart colors from original palette -->
+ <!-- add Chart colors from original palette (also 12, coincidence?) -->
<draw:color draw:name="Chart 1" draw:color="#004586"/>
<draw:color draw:name="Chart 2" draw:color="#ff420e"/>
<draw:color draw:name="Chart 3" draw:color="#ffd320"/>
Modified: openoffice/branches/ia2/main/formula/source/ui/dlg/ControlHelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/formula/source/ui/dlg/ControlHelper.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/formula/source/ui/dlg/ControlHelper.hxx (original)
+++ openoffice/branches/ia2/main/formula/source/ui/dlg/ControlHelper.hxx Sat May 18 10:12:43 2013
@@ -183,6 +183,7 @@ public:
void Hide();
void Show();
+ void UpdateAccessibleNames();
};
}
Modified: openoffice/branches/ia2/main/formula/source/ui/dlg/formdlgs.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/formula/source/ui/dlg/formdlgs.src?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/formula/source/ui/dlg/formdlgs.src (original)
+++ openoffice/branches/ia2/main/formula/source/ui/dlg/formdlgs.src Sat May 18 10:12:43 2013
@@ -225,11 +225,17 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
Right = TRUE ;
Text [ en-US ] = "Function result" ;
};
- Window WND_RESULT
+//IAccessibility2 Implementation 2009-----
+ //Window WND_RESULT
+ FixedText WND_RESULT
+//-----IAccessibility2 Implementation 2009
{
Border = TRUE ;
Pos = MAP_APPFONT ( 255 , 4 ) ;
Size = MAP_APPFONT ( 60 , 12 ) ;
+//IAccessibility2 Implementation 2009-----
+ Text [ en-US ] = "Function result" ;
+//-----IAccessibility2 Implementation 2009
};
FixedText FT_FORMULA_RESULT
{
Modified: openoffice/branches/ia2/main/formula/source/ui/dlg/funcutl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/formula/source/ui/dlg/funcutl.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/formula/source/ui/dlg/funcutl.cxx (original)
+++ openoffice/branches/ia2/main/formula/source/ui/dlg/funcutl.cxx Sat May 18 10:12:43 2013
@@ -34,6 +34,9 @@
#include "ControlHelper.hxx"
#include "ModuleHelper.hxx"
#include "ForResId.hrc"
+// IAccessibility2 implementation 2009. ------
+#include "com/sun/star/accessibility/AccessibleRole.hpp"
+// ------ IAccessibility2 implementation 2009.
namespace formula
@@ -69,6 +72,7 @@ ValWnd::ValWnd( Window* pParent, const R
aRectOut = Rectangle( Point( 1, ( nDiff<2 ) ? 1 : nDiff/2),
Size ( aSzWnd.Width()-2, nHeight ) );
SetClipRegion( Region( aRectOut ) );
+ SetAccessibleRole( ::com::sun::star::accessibility::AccessibleRole::LABEL );
}
//----------------------------------------------------------------------------
@@ -472,7 +476,21 @@ void ArgInput::Show()
pRefBtn->Show();
}
}
+//IAccessibility2 Implementation 2009-----
+void ArgInput::UpdateAccessibleNames()
+{
+ String aArgName = String::CreateFromAscii(":");
+ aArgName += pFtArg->GetText();
+ String aName = pBtnFx->GetQuickHelpText();
+ aName += aArgName;
+ pBtnFx->SetAccessibleName(aName);
+
+ aName = pRefBtn->GetQuickHelpText();
+ aName += aArgName;
+ pRefBtn->SetAccessibleName(aName);
+}
+
/*************************************************************************
#* Member: FxClick Datum:13.01.97
#*------------------------------------------------------------------------
Modified: openoffice/branches/ia2/main/formula/source/ui/dlg/parawin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/formula/source/ui/dlg/parawin.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/formula/source/ui/dlg/parawin.cxx (original)
+++ openoffice/branches/ia2/main/formula/source/ui/dlg/parawin.cxx Sat May 18 10:12:43 2013
@@ -374,6 +374,7 @@ void ParaWin::SetEditDesc(const String&
void ParaWin::SetArgName(sal_uInt16 no,const String& aText)
{
aArgInput[no].SetArgName(aText);
+ aArgInput[no].UpdateAccessibleNames();
}
void ParaWin::SetArgNameFont(sal_uInt16 no,const Font& aFont)
@@ -419,6 +420,7 @@ void ParaWin::InitArgInput( sal_uInt16 n
aArgInput[nPos].SetFxFocusHdl ( LINK( this, ParaWin, GetFxFocusHdl ) );
aArgInput[nPos].SetEdFocusHdl ( LINK( this, ParaWin, GetEdFocusHdl ) );
aArgInput[nPos].SetEdModifyHdl ( LINK( this, ParaWin, ModifyHdl ) );
+ aArgInput[nPos].UpdateAccessibleNames();
}
void ParaWin::ClearAll()
@@ -516,6 +518,7 @@ void ParaWin::SliderMoved()
aArgInput[nEdFocus].SetArgSelection(Selection(0,SELECTION_MAX ));
nActiveLine=nEdFocus+nOffset;
ArgumentModified();
+ aArgInput[nEdFocus].UpdateAccessibleNames();
}
aScrollLink.Call(this);
}
@@ -596,6 +599,7 @@ IMPL_LINK( ParaWin, GetEdFocusHdl, ArgIn
UpdateArgDesc( nEdFocus );
nActiveLine=nEdFocus+nOffset;
ArgumentModified();
+ aArgInput[nEdFocus].UpdateAccessibleNames();
}
return 0;
Modified: openoffice/branches/ia2/main/hwpfilter/source/hwpreader.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/hwpfilter/source/hwpreader.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/hwpfilter/source/hwpreader.cxx (original)
+++ openoffice/branches/ia2/main/hwpfilter/source/hwpreader.cxx Sat May 18 10:12:43 2013
@@ -1944,7 +1944,7 @@ void HwpReader::makeTableStyle(Table *tb
// --------------- row ---------------- //
for (size_t i = 0 ; i < tbl->rows.nCount -1 ; i++)
{
- sprintf(buf,"Table%d.row%ld",hbox->style.boxnum, i + 1);
+ sprintf(buf,"Table%d.row%" SAL_PRI_SIZET "d",hbox->style.boxnum, i + 1);
padd(ascii("style:name"), sXML_CDATA, ascii( buf ));
padd(ascii("style:family"), sXML_CDATA,ascii("table-row"));
rstartEl(ascii("style:style"), rList);
Modified: openoffice/branches/ia2/main/i18npool/source/localedata/data/gl_ES.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/i18npool/source/localedata/data/gl_ES.xml?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/i18npool/source/localedata/data/gl_ES.xml (original)
+++ openoffice/branches/ia2/main/i18npool/source/localedata/data/gl_ES.xml Sat May 18 10:12:43 2013
@@ -204,99 +204,99 @@
<DaysOfWeek>
<Day>
<DayID>sun</DayID>
- <DefaultAbbrvName>dom.</DefaultAbbrvName>
+ <DefaultAbbrvName>dom</DefaultAbbrvName>
<DefaultFullName>domingo</DefaultFullName>
</Day>
<Day>
<DayID>mon</DayID>
- <DefaultAbbrvName>lun.</DefaultAbbrvName>
+ <DefaultAbbrvName>lun</DefaultAbbrvName>
<DefaultFullName>luns</DefaultFullName>
</Day>
<Day>
<DayID>tue</DayID>
- <DefaultAbbrvName>mar.</DefaultAbbrvName>
+ <DefaultAbbrvName>mar</DefaultAbbrvName>
<DefaultFullName>martes</DefaultFullName>
</Day>
<Day>
<DayID>wed</DayID>
- <DefaultAbbrvName>mér.</DefaultAbbrvName>
+ <DefaultAbbrvName>mér</DefaultAbbrvName>
<DefaultFullName>mércores</DefaultFullName>
</Day>
<Day>
<DayID>thu</DayID>
- <DefaultAbbrvName>xov.</DefaultAbbrvName>
+ <DefaultAbbrvName>xov</DefaultAbbrvName>
<DefaultFullName>xoves</DefaultFullName>
</Day>
<Day>
<DayID>fri</DayID>
- <DefaultAbbrvName>ven.</DefaultAbbrvName>
+ <DefaultAbbrvName>ven</DefaultAbbrvName>
<DefaultFullName>venres</DefaultFullName>
</Day>
<Day>
<DayID>sat</DayID>
- <DefaultAbbrvName>sáb.</DefaultAbbrvName>
+ <DefaultAbbrvName>sáb</DefaultAbbrvName>
<DefaultFullName>sábado</DefaultFullName>
</Day>
</DaysOfWeek>
<MonthsOfYear>
<Month>
<MonthID>jan</MonthID>
- <DefaultAbbrvName>xan.</DefaultAbbrvName>
+ <DefaultAbbrvName>xan</DefaultAbbrvName>
<DefaultFullName>xaneiro</DefaultFullName>
</Month>
<Month>
<MonthID>feb</MonthID>
- <DefaultAbbrvName>feb.</DefaultAbbrvName>
+ <DefaultAbbrvName>feb</DefaultAbbrvName>
<DefaultFullName>febreiro</DefaultFullName>
</Month>
<Month>
<MonthID>mar</MonthID>
- <DefaultAbbrvName>mar.</DefaultAbbrvName>
+ <DefaultAbbrvName>mar</DefaultAbbrvName>
<DefaultFullName>marzo</DefaultFullName>
</Month>
<Month>
<MonthID>apr</MonthID>
- <DefaultAbbrvName>abr.</DefaultAbbrvName>
+ <DefaultAbbrvName>abr</DefaultAbbrvName>
<DefaultFullName>abril</DefaultFullName>
</Month>
<Month>
<MonthID>may</MonthID>
- <DefaultAbbrvName>mai.</DefaultAbbrvName>
+ <DefaultAbbrvName>mai</DefaultAbbrvName>
<DefaultFullName>maio</DefaultFullName>
</Month>
<Month>
<MonthID>jun</MonthID>
- <DefaultAbbrvName>xuñ.</DefaultAbbrvName>
+ <DefaultAbbrvName>xuñ</DefaultAbbrvName>
<DefaultFullName>xuño</DefaultFullName>
</Month>
<Month>
<MonthID>jul</MonthID>
- <DefaultAbbrvName>xul.</DefaultAbbrvName>
+ <DefaultAbbrvName>xul</DefaultAbbrvName>
<DefaultFullName>xullo</DefaultFullName>
</Month>
<Month>
<MonthID>aug</MonthID>
- <DefaultAbbrvName>ago.</DefaultAbbrvName>
+ <DefaultAbbrvName>ago</DefaultAbbrvName>
<DefaultFullName>agosto</DefaultFullName>
</Month>
<Month>
<MonthID>sep</MonthID>
- <DefaultAbbrvName>set.</DefaultAbbrvName>
+ <DefaultAbbrvName>set</DefaultAbbrvName>
<DefaultFullName>setembro</DefaultFullName>
</Month>
<Month>
<MonthID>oct</MonthID>
- <DefaultAbbrvName>out.</DefaultAbbrvName>
+ <DefaultAbbrvName>out</DefaultAbbrvName>
<DefaultFullName>outubro</DefaultFullName>
</Month>
<Month>
<MonthID>nov</MonthID>
- <DefaultAbbrvName>nov.</DefaultAbbrvName>
+ <DefaultAbbrvName>nov</DefaultAbbrvName>
<DefaultFullName>novembro</DefaultFullName>
</Month>
<Month>
<MonthID>dec</MonthID>
- <DefaultAbbrvName>dec.</DefaultAbbrvName>
+ <DefaultAbbrvName>dec</DefaultAbbrvName>
<DefaultFullName>decembro</DefaultFullName>
</Month>
</MonthsOfYear>
Modified: openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu (original)
+++ openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu Sat May 18 10:12:43 2013
@@ -345,10 +345,13 @@
<prop oor:name="ContextList">
<value oor:separator=";">
Calc, Draw, visible ;
+ Calc, OLE, hidden ;
DrawImpress, 3DObject, visible ;
DrawImpress, Draw, visible ;
DrawImpress, TextObject, hidden ;
+ DrawImpress, OLE, hidden ;
WriterVariants, Draw, visible ;
+ WriterVariants, OLE, hidden, .uno:FrameDialog ;
</value>
</prop>
<prop oor:name="ImplementationURL" oor:type="xs:string">
@@ -376,11 +379,14 @@
<value oor:separator=";">
Calc, Draw, visible ;
Calc, Graphic, visible ;
+ Calc, OLE, hidden ;
DrawImpress, 3DObject, visible ;
DrawImpress, Draw, visible ;
DrawImpress, Graphic, visible ;
DrawImpress, TextObject, hidden ;
+ DrawImpress, OLE, hidden ;
WriterVariants, Draw, visible ;
+ WriterVariants, OLE, hidden, .uno:FrameDialog ;
</value>
</prop>
<prop oor:name="ImplementationURL" oor:type="xs:string">
@@ -740,12 +746,13 @@
<value>PropertyDeck</value>
</prop>
<prop oor:name="DefaultMenuCommand">
- <value>.uno:FormatCellDialg</value>
+ <value>.uno:FormatCellDialog</value>
</prop>
<prop oor:name="ContextList">
<value oor:separator=";">
Calc, Auditing, visible ;
Calc, Cell, visible ;
+ Calc, EditCell, visible ;
Calc, default, visible ;
Calc, Pivot, visible ;
</value>
@@ -775,6 +782,7 @@
<value oor:separator=";">
Calc, Auditing, hidden ;
Calc, Cell, hidden ;
+ Calc, EditCell, hidden ;
Calc, default, hidden ;
Calc, Pivot, hidden ;
</value>
@@ -859,6 +867,9 @@
<prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
<value>true</value>
</prop>
+ <prop oor:name="ShowForReadOnlyDocument" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
<prop oor:name="Id" oor:type="xs:string">
<value>SwNavigatorPanel</value>
</prop>
@@ -885,6 +896,9 @@
<prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
<value>true</value>
</prop>
+ <prop oor:name="ShowForReadOnlyDocument" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
<prop oor:name="Id" oor:type="xs:string">
<value>ScNavigatorPanel</value>
</prop>
@@ -911,6 +925,9 @@
<prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
<value>true</value>
</prop>
+ <prop oor:name="ShowForReadOnlyDocument" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
<prop oor:name="Id" oor:type="xs:string">
<value>SdNavigatorPanel</value>
</prop>
@@ -982,6 +999,29 @@
</prop>
</node>
+ <node oor:name="InsertPropertyPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Insert Shapes</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>InsertPropertyPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Draw, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SvxPanelFactory/InsertPropertyPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>50</value>
+ </prop>
+ </node>
+
</node>
</node>
</oor:component-data>
Modified: openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs (original)
+++ openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs Sat May 18 10:12:43 2013
@@ -6185,6 +6185,32 @@
</info>
<value>25</value>
</prop>
+ <prop oor:name="ColorValueSetColumnCount" oor:type="xs:short">
+ <info>
+ <author>ALG</author>
+ <desc>
+ This option controls how many columns the ColorValueSets (the matrix-organized dialogs for color select)
+ will have. The default is 12 and this is aligned with the layout of the standard color palette. thus, when you
+ change this value, you should know what you do. This setting also influences some width-oriented layouts in
+ dialogs where this ColorValueSets are used, e.g. FillStyle dialog.
+ </desc>
+ <label>Defines the number of columns that will be shown in a ColorValueSet.</label>
+ </info>
+ <value>12</value>
+ </prop>
+ <prop oor:name="PreviewUsesCheckeredBackground" oor:type="xs:boolean">
+ <info>
+ <author>ALG</author>
+ <desc>
+ This option allows to make previews (e.g. UI previews for object attirbutes) show the content with a checkeded
+ background to allow simple identification and better preview of transparent content, e.g. when a draw object
+ is filled with a transparent graphic (SVG or bitmap) the preview will show the checkered background shine
+ through, so the user can identify that the fill has transparency with a single look.
+ </desc>
+ <label>Shows previews with shining through checkered background to visualize transparency.</label>
+ </info>
+ <value>false</value>
+ </prop>
</group>
<set oor:name="OfficeObjects" oor:node-type="ObjectNames">
<info>
Modified: openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs (original)
+++ openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs Sat May 18 10:12:43 2013
@@ -87,6 +87,8 @@
com.sun.star.text.GlobalDocument
com.sun.star.text.WebDocument
com.sun.star.xforms.XMLFormDocument
+ com.sun.star.sdb.FormDesign
+ com.sun.star.sdb.TextReportDesign
com.sun.star.sheet.SpreadsheetDocument
com.sun.star.presentation.PresentationDocument
com.sun.star.drawing.DrawingDocument
@@ -206,6 +208,12 @@
</info>
<value>10000</value>
</prop>
+ <prop oor:name="ShowForReadOnlyDocument" oor:type="xs:boolean">
+ <info>
+ <desc>This flag controls whether the panel is shown when the document in the edit view is read only.</desc>
+ </info>
+ <value>false</value>
+ </prop>
<prop oor:name="WantsCanvas" oor:type="xs:boolean">
<info>
<desc>Experimental: Set to true when panel wants to paint its content via a XCanvas.</desc>
Modified: openoffice/branches/ia2/main/oox/inc/oox/export/shapes.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/oox/inc/oox/export/shapes.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/oox/inc/oox/export/shapes.hxx (original)
+++ openoffice/branches/ia2/main/oox/inc/oox/export/shapes.hxx Sat May 18 10:12:43 2013
@@ -62,7 +62,7 @@ private:
struct ShapeHash
{
- std::hash<const char*> maHashFunction;
+ rtl::CStringHash maHashFunction;
size_t operator()( const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > ) const;
};
Modified: openoffice/branches/ia2/main/oox/source/export/shapes.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/oox/source/export/shapes.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/oox/source/export/shapes.cxx (original)
+++ openoffice/branches/ia2/main/oox/source/export/shapes.cxx Sat May 18 10:12:43 2013
@@ -307,15 +307,7 @@ static const CustomShapeTypeTranslationT
{ "mso-spt202", "rect" }
};
-struct StringCheck
-{
- bool operator()( const char* s1, const char* s2 ) const
- {
- return strcmp( s1, s2 ) == 0;
- }
-};
-
-typedef std::hash_map< const char*, const char*, std::hash<const char*>, StringCheck> CustomShapeTypeTranslationHashMap;
+typedef std::hash_map< const char*, const char*, CStringHash, CStringEqual> CustomShapeTypeTranslationHashMap;
static CustomShapeTypeTranslationHashMap* pCustomShapeTypeTranslationHashMap = NULL;
static const char* lcl_GetPresetGeometry( const char* sShapeType )
@@ -869,7 +861,7 @@ ShapeExport& ShapeExport::WriteRectangle
}
typedef ShapeExport& (ShapeExport::*ShapeConverter)( Reference< XShape > );
-typedef std::hash_map< const char*, ShapeConverter, std::hash<const char*>, StringCheck> NameToConvertMapType;
+typedef std::hash_map< const char*, ShapeConverter, CStringHash, CStringEqual> NameToConvertMapType;
static const NameToConvertMapType& lcl_GetConverters()
{
Modified: openoffice/branches/ia2/main/package/source/manifest/ManifestImport.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/package/source/manifest/ManifestImport.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/package/source/manifest/ManifestImport.cxx (original)
+++ openoffice/branches/ia2/main/package/source/manifest/ManifestImport.cxx Sat May 18 10:12:43 2013
@@ -137,7 +137,7 @@ void SAL_CALL ManifestImport::startEleme
nDerivedKeySize = 0;
if ( !bIgnoreEncryptData )
{
- long nDigestId = 0;
+ sal_Int32 nDigestId = 0;
const OUString& rChecksumType = aConvertedAttribs[sChecksumTypeAttribute];
if( rChecksumType.equalsAscii( SHA1_1K_NAME )
|| rChecksumType.equalsAscii( SHA1_1K_URL ) )
@@ -164,7 +164,7 @@ void SAL_CALL ManifestImport::startEleme
{
if ( !bIgnoreEncryptData )
{
- long nCypherId = 0;
+ sal_Int32 nCypherId = 0;
const OUString& rAlgoName = aConvertedAttribs[sAlgorithmNameAttribute];
if ( rAlgoName.equalsAscii( BLOWFISH_NAME )
|| rAlgoName.equalsAscii( BLOWFISH_URL ) )
Modified: openoffice/branches/ia2/main/python/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/python/makefile.mk?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/python/makefile.mk (original)
+++ openoffice/branches/ia2/main/python/makefile.mk Sat May 18 10:12:43 2013
@@ -42,7 +42,7 @@ all:
TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=c57477edd6d18bd9eeca2f21add73919
+TARFILE_MD5=62704ea0f125923208d84ff0568f7d50
PATCH_FILES=\
python-solaris.patch \
python-freebsd.patch \
Modified: openoffice/branches/ia2/main/python/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/python/prj/d.lst?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/python/prj/d.lst (original)
+++ openoffice/branches/ia2/main/python/prj/d.lst Sat May 18 10:12:43 2013
@@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multipro
mkdir: %_DEST%\lib%_EXT%\python\unittest
mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
-..\%__SRC%\misc\build\Python-2.7.3\Lib\* %_DEST%\lib%_EXT%\python\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\config\* %_DEST%\lib%_EXT%\python\config\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.3\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\*
-..\%__SRC%\misc\build\Python-2.7.3\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile
+..\%__SRC%\misc\build\Python-2.7.4\Lib\* %_DEST%\lib%_EXT%\python\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\config\* %_DEST%\lib%_EXT%\python\config\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
+..\%__SRC%\misc\build\Python-2.7.4\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\*
+..\%__SRC%\misc\build\Python-2.7.4\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile
..\pyversion.mk %_DEST%\inc%_EXT%\pyversion.mk
-..\%__SRC%\misc\build\Python-2.7.3\Include\* %_DEST%\inc%_EXT%\python\*
+..\%__SRC%\misc\build\Python-2.7.4\Include\* %_DEST%\inc%_EXT%\python\*
#unix ONLY !
..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python
-..\%__SRC%\misc\build\Python-2.7.3\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
+..\%__SRC%\misc\build\Python-2.7.4\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
..\%__SRC%\misc\build\python-inst\lib\python2.7\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*
..\%__SRC%\misc\build\python-inst\bin\python2.7 %_DEST%\bin%_EXT%\python
..\%__SRC%\misc\build\python-inst\lib\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so.1.0
@@ -91,24 +91,24 @@ symlink: %_DEST%\lib%_EXT%\libpython2.7.
#MingW ONLY !
..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.3\libpython2.7.dll %_DEST%\bin%_EXT%\libpython2.7.dll
+..\%__SRC%\misc\build\Python-2.7.4\libpython2.7.dll %_DEST%\bin%_EXT%\libpython2.7.dll
# WINDOWS ONLY !
..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\python27.dll %_DEST%\bin%_EXT%\python27.dll
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\python27.lib %_DEST%\lib%_EXT%\python27.lib
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\python.exe %_DEST%\bin%_EXT%\python.exe
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\python27.dll %_DEST%\bin%_EXT%\python27.dll
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\python27.lib %_DEST%\lib%_EXT%\python27.lib
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
#linklib: libpython.so.*.*.*
Modified: openoffice/branches/ia2/main/python/python-freebsd.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/python/python-freebsd.patch?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/python/python-freebsd.patch (original)
+++ openoffice/branches/ia2/main/python/python-freebsd.patch Sat May 18 10:12:43 2013
@@ -1,5 +1,5 @@
---- misc/Python-2.7.3/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500
-+++ misc/build/Python-2.7.3/Lib/plat-freebsd9/IN.py 2012-08-01 18:56:04.000000000 -0500
+--- misc/Python-2.7.4/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500
++++ misc/build/Python-2.7.4/Lib/plat-freebsd9/IN.py 2012-08-01 18:56:04.000000000 -0500
@@ -0,0 +1,612 @@
+# Generated by h2py from /usr/include/netinet/in.h
+
@@ -613,14 +613,14 @@
+IPV6CTL_NORBIT_RAIF = 49
+IPV6CTL_RFC6204W3 = 50
+IPV6CTL_MAXID = 51
---- misc/Python-2.7.3/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500
-+++ misc/build/Python-2.7.3/Lib/plat-freebsd9/regen 2012-08-01 18:55:27.000000000 -0500
+--- misc/Python-2.7.4/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500
++++ misc/build/Python-2.7.4/Lib/plat-freebsd9/regen 2012-08-01 18:55:27.000000000 -0500
@@ -0,0 +1,3 @@
+#! /bin/sh
+set -v
+python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
---- misc/Python-2.7.3/Lib/test/test_threading.py 2012-04-09 18:07:32.000000000 -0500
-+++ misc/build/Python-2.7.3/Lib/test/test_threading.py 2012-08-01 18:44:40.000000000 -0500
+--- misc/Python-2.7.4/Lib/test/test_threading.py 2012-04-09 18:07:32.000000000 -0500
++++ misc/build/Python-2.7.4/Lib/test/test_threading.py 2012-08-01 18:44:40.000000000 -0500
@@ -421,7 +421,7 @@
# #12316 and #11870), and fork() from a worker thread is known to trigger
# problems with some operating systems (issue #3863): skip problematic tests
@@ -630,8 +630,8 @@
'os2emx')
def _run_and_join(self, script):
---- misc/Python-2.7.3/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure 2012-08-01 18:53:21.000000000 -0500
+--- misc/Python-2.7.4/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.4/Modules/_ctypes/libffi/configure 2012-08-01 18:53:21.000000000 -0500
@@ -6289,7 +6289,7 @@
rm -rf conftest*
;;
@@ -651,8 +651,8 @@
powerpc*-*-rtems*)
TARGET=POWERPC; TARGETDIR=powerpc
;;
---- misc/Python-2.7.3/Modules/fcntlmodule.c 2012-04-09 18:07:34.000000000 -0500
-+++ misc/build/Python-2.7.3/Modules/fcntlmodule.c 2012-08-01 18:44:40.000000000 -0500
+--- misc/Python-2.7.4/Modules/fcntlmodule.c 2012-04-09 18:07:34.000000000 -0500
++++ misc/build/Python-2.7.4/Modules/fcntlmodule.c 2012-08-01 18:44:40.000000000 -0500
@@ -97,20 +97,15 @@
{
#define IOCTL_BUFSZ 1024
@@ -704,8 +704,8 @@
" an integer and optionally an integer or buffer argument",
conv_descriptor, &fd, &code, &arg)) {
return NULL;
---- misc/Python-2.7.3/Python/thread_pthread.h 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/Python/thread_pthread.h 2012-08-01 18:44:40.000000000 -0500
+--- misc/Python-2.7.4/Python/thread_pthread.h 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/Python/thread_pthread.h 2012-08-01 18:44:40.000000000 -0500
@@ -38,13 +38,18 @@
#endif
#endif
@@ -759,9 +759,9 @@
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_destroy(&attrs);
#endif
-diff -ruN misc/Python-2.7.3/configure misc/build/Python-2.7.3/configure
---- misc/Python-2.7.3/configure 2012-04-09 18:07:36.000000000 -0500
-+++ misc/build/Python-2.7.3/configure 2012-08-01 18:44:40.000000000 -0500
+diff -ruN misc/Python-2.7.4/configure misc/build/Python-2.7.4/configure
+--- misc/Python-2.7.4/configure 2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.4/configure 2012-08-01 18:44:40.000000000 -0500
@@ -4916,7 +4916,7 @@
;;
SunOS*)
@@ -783,24 +783,24 @@ diff -ruN misc/Python-2.7.3/configure mi
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
-diff -ruN misc/Python-2.7.3/setup.py misc/build/Python-2.7.3/setup.py
---- misc/Python-2.7.3/setup.py 2012-04-09 18:07:36.000000000 -0500
-+++ misc/build/Python-2.7.3/setup.py 2012-08-01 18:44:40.000000000 -0500
-@@ -1432,7 +1432,7 @@
+diff -ruN misc/Python-2.7.4/setup.py misc/build/Python-2.7.4/setup.py
+--- misc/Python-2.7.4/setup.py 2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.4/setup.py 2012-08-01 18:44:40.000000000 -0500
+@@ -1555,7 +1540,7 @@
macros = dict()
libraries = []
-- elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-+ elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
+- elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
++ elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
# FreeBSD's P1003.1b semaphore support is very experimental
# and has many known problems. (as of June 2008)
macros = dict()
-@@ -1484,7 +1484,7 @@
+@@ -1607,7 +1592,7 @@
missing.append('linuxaudiodev')
- if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
+ if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
- 'freebsd7', 'freebsd8')
+ 'freebsd7', 'freebsd8', 'freebsd9')
- or platform.startswith("gnukfreebsd")):
+ or host_platform.startswith("gnukfreebsd")):
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
else:
Modified: openoffice/branches/ia2/main/python/python-md5.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/python/python-md5.patch?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/python/python-md5.patch (original)
+++ openoffice/branches/ia2/main/python/python-md5.patch Sat May 18 10:12:43 2013
@@ -1,6 +1,6 @@
-diff -ru misc/Python-2.7.3/Modules/Setup.dist misc/build/Python-2.7.3/Modules/Setup.dist
---- misc/Python-2.7.3/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.3/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500
+diff -ru misc/Python-2.7.4/Modules/Setup.dist misc/build/Python-2.7.4/Modules/Setup.dist
+--- misc/Python-2.7.4/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.4/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500
@@ -248,14 +248,14 @@
# Message-Digest Algorithm, described in RFC 1321. The necessary files
# md5.c and md5.h are included here.
Modified: openoffice/branches/ia2/main/python/python-solaris.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/python/python-solaris.patch?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/python/python-solaris.patch (original)
+++ openoffice/branches/ia2/main/python/python-solaris.patch Sat May 18 10:12:43 2013
@@ -1,5 +1,5 @@
---- misc/Python-2.7.3/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
-+++ misc/build/Python-2.7.3/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500
+--- misc/Python-2.7.4/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
++++ misc/build/Python-2.7.4/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500
@@ -603,11 +603,6 @@
in platform-specific #ifdefs.
**************************************************************************/
Modified: openoffice/branches/ia2/main/python/python-ssl.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/python/python-ssl.patch?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/python/python-ssl.patch (original)
+++ openoffice/branches/ia2/main/python/python-ssl.patch Sat May 18 10:12:43 2013
@@ -1,15 +1,15 @@
-diff -ru misc/Python-2.7.3/PCbuild/build_ssl.py misc/build/Python-2.7.3/PCbuild/build_ssl.py
---- misc/Python-2.7.3/PCbuild/build_ssl.py 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/build_ssl.py 2012-07-25 14:37:37.000000000 -0500
+diff -ru misc/Python-2.7.4/PCbuild/build_ssl.py misc/build/Python-2.7.4/PCbuild/build_ssl.py
+--- misc/Python-2.7.4/PCbuild/build_ssl.py 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/build_ssl.py 2012-07-25 14:37:37.000000000 -0500
@@ -253,4 +253,4 @@
sys.exit(rc)
if __name__=='__main__':
- main()
+ sys.exit(0)
-diff -ru misc/Python-2.7.3/setup.py misc/build/Python-2.7.3/setup.py
---- misc/Python-2.7.3/setup.py 2012-04-09 18:07:36.000000000 -0500
-+++ misc/build/Python-2.7.3/setup.py 2012-07-25 14:37:37.000000000 -0500
+diff -ru misc/Python-2.7.4/setup.py misc/build/Python-2.7.4/setup.py
+--- misc/Python-2.7.4/setup.py 2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.4/setup.py 2012-07-25 14:37:37.000000000 -0500
@@ -702,7 +702,15 @@
exts.append( Extension('_socket', ['socketmodule.c'],
depends = ['socketmodule.h']) )
Modified: openoffice/branches/ia2/main/python/pyversion.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/python/pyversion.mk?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/python/pyversion.mk (original)
+++ openoffice/branches/ia2/main/python/pyversion.mk Sat May 18 10:12:43 2013
@@ -22,7 +22,7 @@
# in the python project accordingly !!!
PYMAJOR=2
PYMINOR=7
-PYMICRO=3
+PYMICRO=4
PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
.IF "$(GUI)" == "UNX"
Modified: openoffice/branches/ia2/main/reportdesign/source/ui/dlg/Condition.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/reportdesign/source/ui/dlg/Condition.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/reportdesign/source/ui/dlg/Condition.cxx (original)
+++ openoffice/branches/ia2/main/reportdesign/source/ui/dlg/Condition.cxx Sat May 18 10:12:43 2013
@@ -146,9 +146,9 @@ OColorPopup::OColorPopup(Window* _pParen
m_aColorSet.SetHelpId( HID_RPT_POPUP_COLOR_CTRL );
SetHelpId( HID_RPT_POPUP_COLOR );
const Size aSize12( 13, 13 );
- ::std::auto_ptr< XColorList > pColorTable(new XColorList( SvtPathOptions().GetPalettePath() ));
+ XColorListSharedPtr aColorTable(XPropertyListFactory::CreateSharedXColorList(SvtPathOptions().GetPalettePath()));
short i = 0;
- long nCount = pColorTable->Count();
+ long nCount = aColorTable.get() ? aColorTable->Count() : 0;
XColorEntry* pEntry = NULL;
Color aColWhite( COL_WHITE );
String aStrWhite( ModuleRes(STR_COLOR_WHITE) );
@@ -159,7 +159,7 @@ OColorPopup::OColorPopup(Window* _pParen
for ( i = 0; i < nCount; i++ )
{
- pEntry = pColorTable->GetColor(i);
+ pEntry = aColorTable->GetColor(i);
m_aColorSet.InsertItem( i+1, pEntry->GetColor(), pEntry->GetName() );
}
Modified: openoffice/branches/ia2/main/reportdesign/source/ui/misc/UITools.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/reportdesign/source/ui/misc/UITools.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/reportdesign/source/ui/misc/UITools.cxx (original)
+++ openoffice/branches/ia2/main/reportdesign/source/ui/misc/UITools.cxx Sat May 18 10:12:43 2013
@@ -654,7 +654,7 @@ bool openCharDialog( const uno::Referenc
};
Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow );
::std::auto_ptr<FontList> pFontList(new FontList( pParent ));
- ::std::auto_ptr< XColorList > pColorTable( new XColorList( SvtPathOptions().GetPalettePath() ));
+ XColorListSharedPtr aColorTable(XPropertyListFactory::CreateSharedXColorList(SvtPathOptions().GetPalettePath()));
SfxPoolItem* pDefaults[] =
{
new SvxFontItem(ITEMID_FONT),
@@ -675,7 +675,7 @@ bool openCharDialog( const uno::Referenc
new SvxEscapementItem(ITEMID_ESCAPEMENT),
new SvxFontListItem(pFontList.get(),ITEMID_FONTLIST),
new SvxAutoKernItem(sal_False,ITEMID_AUTOKERN),
- new SvxColorTableItem(pColorTable.get(),ITEMID_COLOR_TABLE),
+ new SvxColorTableItem(aColorTable,ITEMID_COLOR_TABLE),
new SvxBlinkItem(sal_False,ITEMID_BLINK),
new SvxEmphasisMarkItem(EMPHASISMARK_NONE,ITEMID_EMPHASISMARK),
new SvxTwoLinesItem(sal_True,0,0,ITEMID_TWOLINES),
@@ -771,11 +771,6 @@ bool openAreaDialog( const uno::Referenc
{ // want the dialog to be destroyed before our set
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
::std::auto_ptr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get() ));
- // #i74099# by default, the dialog deletes the current color table if a different one is loaded
- // (see SwDrawShell::ExecDrawDlg)
- const SvxColorTableItem* pColorItem = static_cast<const SvxColorTableItem*>( pDescriptor->GetItem(SID_COLOR_TABLE) );
- if (pColorItem && pColorItem->GetColorTable() == XColorList::GetStdColorList())
- pDialog->DontDeleteColorTable();
bSuccess = ( RET_OK == pDialog->Execute() );
if ( bSuccess )
{
Modified: openoffice/branches/ia2/main/sal/inc/rtl/string.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sal/inc/rtl/string.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sal/inc/rtl/string.hxx (original)
+++ openoffice/branches/ia2/main/sal/inc/rtl/string.hxx Sat May 18 10:12:43 2013
@@ -930,8 +930,31 @@ struct OStringHash
/* ======================================================================= */
+/** Equality functor for classic c-strings (i.e. null-terminated char* strings) */
+struct CStringEqual
+{
+ bool operator()( const char* p1, const char* p2) const {
+ while( *p1)
+ if( *(p1++) != *(p2++))
+ return false;
+ return true;
+ }
+};
+
+/** Hashing functor for classic c-strings (i.e. null-terminated char* strings) */
+struct CStringHash
+{
+ size_t operator()( const char* p) const {
+ size_t n = 0;
+ while( *p)
+ n += 4*n + *reinterpret_cast<const unsigned char*>(p++);
+ return n;
+ }
+};
+
} /* Namespace */
#endif /* __cplusplus */
#endif /* _RTL_STRING_HXX_ */
+
Modified: openoffice/branches/ia2/main/sc/inc/document.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/inc/document.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/inc/document.hxx (original)
+++ openoffice/branches/ia2/main/sc/inc/document.hxx Sat May 18 10:12:43 2013
@@ -76,6 +76,7 @@ class SvxSearchItem;
class SvxShadowItem;
class Window;
class XColorList;
+typedef ::boost::shared_ptr< XColorList > XColorListSharedPtr;
class List;
class ScAutoFormatData;
@@ -261,7 +262,7 @@ private:
SfxPrinter* pPrinter;
VirtualDevice* pVirtualDevice_100th_mm;
ScDrawLayer* pDrawLayer; // SdrModel
- XColorList* pColorTable;
+ XColorListSharedPtr maColorTable;
ScConditionalFormatList* pCondFormList; // bedingte Formate
ScValidationDataList* pValidationList; // Gueltigkeit
SvNumberFormatterIndexTable* pFormatExchangeList; // zum Umsetzen von Zahlenformaten
@@ -460,7 +461,7 @@ public:
void GetDocStat( ScDocStat& rDocStat );
SC_DLLPUBLIC void InitDrawLayer( SfxObjectShell* pDocShell = NULL );
- XColorList* GetColorTable();
+ XColorListSharedPtr GetColorTable();
SC_DLLPUBLIC sfx2::LinkManager* GetLinkManager() const;
@@ -1858,7 +1859,6 @@ private: // CLOOK-Impl-Methoden
void ImplDeleteOptions();
void DeleteDrawLayer();
- void DeleteColorTable();
SC_DLLPUBLIC sal_Bool DrawGetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool bSetVer ) const;
void DrawMovePage( sal_uInt16 nOldPos, sal_uInt16 nNewPos );
void DrawCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos );
Modified: openoffice/branches/ia2/main/sc/source/core/data/documen2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/core/data/documen2.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/core/data/documen2.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/core/data/documen2.cxx Sat May 18 10:12:43 2013
@@ -130,7 +130,7 @@ ScDocument::ScDocument( ScDocumentMode e
pPrinter( NULL ),
pVirtualDevice_100th_mm( NULL ),
pDrawLayer( NULL ),
- pColorTable( NULL ),
+ maColorTable(),
pCondFormList( NULL ),
pValidationList( NULL ),
pFormatExchangeList( NULL ),
@@ -457,7 +457,6 @@ ScDocument::~ScDocument()
xPoolHelper->SourceDocumentGone();
xPoolHelper.unbind();
- DeleteColorTable();
delete pScriptTypeData;
delete pOtherObjects;
delete pRecursionHelper;
Modified: openoffice/branches/ia2/main/sc/source/core/data/documen3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/core/data/documen3.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/core/data/documen3.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/core/data/documen3.cxx Sat May 18 10:12:43 2013
@@ -1296,7 +1296,7 @@ sal_Bool ScDocument::CreateQueryParam(SC
return sal_False;
}
-sal_Bool ScDocument::HasAutoFilter( SCCOL nCurCol, SCROW nCurRow, SCTAB nCurTab )
+sal_Bool ScDocument::HasAutoFilter( SCCOL /*nCurCol*/, SCROW /*nCurRow*/, SCTAB nCurTab )
{
//ScDBData* pDBData = GetDBAtCursor( nCurCol, nCurRow, nCurTab );
ScDBData* pDBData = GetDBAtTable(nCurTab, SC_DB_OLD_FILTER);
Modified: openoffice/branches/ia2/main/sc/source/core/data/documen9.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/core/data/documen9.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/core/data/documen9.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/core/data/documen9.cxx Sat May 18 10:12:43 2013
@@ -89,19 +89,19 @@ void ScDocument::EndDrawUndo()
delete pDrawLayer->GetCalcUndo();
}
-XColorList* ScDocument::GetColorTable()
+XColorListSharedPtr ScDocument::GetColorTable()
{
if (pDrawLayer)
- return pDrawLayer->GetColorTable();
+ return pDrawLayer->GetColorTableFromSdrModel();
else
{
- if (!pColorTable)
+ if (!maColorTable.get())
{
SvtPathOptions aPathOpt;
- pColorTable = new XColorList( aPathOpt.GetPalettePath() );
+ maColorTable = XPropertyListFactory::CreateSharedXColorList(aPathOpt.GetPalettePath());
}
- return pColorTable;
+ return maColorTable;
}
}
@@ -257,11 +257,6 @@ void ScDocument::DeleteDrawLayer()
delete pDrawLayer;
}
-void ScDocument::DeleteColorTable()
-{
- delete pColorTable;
-}
-
sal_Bool ScDocument::DrawGetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool bSetVer ) const
{
return pDrawLayer->GetPrintArea( rRange, bSetHor, bSetVer );
Modified: openoffice/branches/ia2/main/sc/source/core/data/drwlayer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/core/data/drwlayer.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/core/data/drwlayer.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/core/data/drwlayer.cxx Sat May 18 10:12:43 2013
@@ -206,8 +206,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pD
NULL, // SfxItemPool* Pool
pGlobalDrawPersist ?
pGlobalDrawPersist :
- ( pDocument ? pDocument->GetDocumentShell() : NULL ),
- sal_True ), // bUseExtColorTable (is set below)
+ ( pDocument ? pDocument->GetDocumentShell() : NULL )),
aName( rName ),
pDoc( pDocument ),
pUndoGroup( NULL ),
@@ -224,12 +223,12 @@ ScDrawLayer::ScDrawLayer( ScDocument* pD
SetObjectShell( pObjSh );
// set color table
- SvxColorTableItem* pColItem = (SvxColorTableItem*) pObjSh->GetItem( SID_COLOR_TABLE );
- XColorList* pXCol = pColItem ? pColItem->GetColorTable() : XColorList::GetStdColorList();
- SetColorTable( pXCol );
+ const SvxColorTableItem* pColItem = static_cast< const SvxColorTableItem* >(pObjSh->GetItem( SID_COLOR_TABLE ));
+ XColorListSharedPtr aXCol = pColItem ? pColItem->GetColorTable() : XColorList::GetStdColorList();
+ SetColorTableAtSdrModel( aXCol );
}
else
- SetColorTable( XColorList::GetStdColorList() );
+ SetColorTableAtSdrModel( XColorList::GetStdColorList() );
SetSwapGraphics(sal_True);
// SetSwapAsynchron(sal_True); // an der View
Modified: openoffice/branches/ia2/main/sc/source/ui/app/typemap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/app/typemap.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/app/typemap.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/app/typemap.cxx Sat May 18 10:12:43 2013
@@ -30,32 +30,8 @@
#include "scitems.hxx"
#include <editeng/memberids.hrc>
-
#define ITEMID_DBTYPE 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
#include <sfx2/msg.hxx>
#include <svl/stritem.hxx>
#include <svl/slstitm.hxx>
@@ -135,6 +111,7 @@
#include <svx/xlncapit.hxx>
#include <svx/xlinjoit.hxx>
#include <svx/AffineMatrixItem.hxx>
+#include <svx/galleryitem.hxx>
#define SFX_TYPEMAP
#include "scslots.hxx"
Modified: openoffice/branches/ia2/main/sc/source/ui/dbgui/scendlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/dbgui/scendlg.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/dbgui/scendlg.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/dbgui/scendlg.cxx Sat May 18 10:12:43 2013
@@ -78,14 +78,14 @@ ScNewScenarioDlg::ScNewScenarioDlg( Wind
const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE );
if ( pItem )
{
- XColorList* pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
- if (pColorTable)
+ XColorListSharedPtr aColorTable = static_cast< const SvxColorTableItem* >(pItem)->GetColorTable();
+ if (aColorTable.get())
{
aLbColor.SetUpdateMode( sal_False );
- long nCount = pColorTable->Count();
+ long nCount = aColorTable->Count();
for ( long n=0; n<nCount; n++ )
{
- XColorEntry* pEntry = pColorTable->GetColor(n);
+ XColorEntry* pEntry = aColorTable->GetColor(n);
aLbColor.InsertEntry( pEntry->GetColor(), pEntry->GetName() );
}
aLbColor.SetUpdateMode( sal_True );
Modified: openoffice/branches/ia2/main/sc/source/ui/docshell/docsh2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/docshell/docsh2.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/docshell/docsh2.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/docshell/docsh2.cxx Sat May 18 10:12:43 2013
@@ -152,12 +152,12 @@ void ScDocShell::InitItems()
ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer();
if (pDrawLayer)
{
- PutItem( SvxColorTableItem ( pDrawLayer->GetColorTable(), SID_COLOR_TABLE ) );
- PutItem( SvxGradientListItem( pDrawLayer->GetGradientList(), SID_GRADIENT_LIST ) );
- PutItem( SvxHatchListItem ( pDrawLayer->GetHatchList(), SID_HATCH_LIST ) );
- PutItem( SvxBitmapListItem ( pDrawLayer->GetBitmapList(), SID_BITMAP_LIST ) );
- PutItem( SvxDashListItem ( pDrawLayer->GetDashList(), SID_DASH_LIST ) );
- PutItem( SvxLineEndListItem ( pDrawLayer->GetLineEndList(), SID_LINEEND_LIST ) );
+ PutItem( SvxColorTableItem ( pDrawLayer->GetColorTableFromSdrModel(), SID_COLOR_TABLE ) );
+ PutItem( SvxGradientListItem( pDrawLayer->GetGradientListFromSdrModel(), SID_GRADIENT_LIST ) );
+ PutItem( SvxHatchListItem ( pDrawLayer->GetHatchListFromSdrModel(), SID_HATCH_LIST ) );
+ PutItem( SvxBitmapListItem ( pDrawLayer->GetBitmapListFromSdrModel(), SID_BITMAP_LIST ) );
+ PutItem( SvxDashListItem ( pDrawLayer->GetDashListFromSdrModel(), SID_DASH_LIST ) );
+ PutItem( SvxLineEndListItem ( pDrawLayer->GetLineEndListFromSdrModel(), SID_LINEEND_LIST ) );
// andere Anpassungen nach dem Anlegen des DrawLayers
Modified: openoffice/branches/ia2/main/sc/source/ui/docshell/docsh4.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/docshell/docsh4.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/docshell/docsh4.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/docshell/docsh4.cxx Sat May 18 10:12:43 2013
@@ -565,9 +565,10 @@ void ScDocShell::Execute( SfxRequest& rR
case SID_GET_COLORTABLE:
{
// passende ColorTable ist per PutItem gesetzt worden
- SvxColorTableItem* pColItem = (SvxColorTableItem*)GetItem(SID_COLOR_TABLE);
- XColorList* pTable = pColItem->GetColorTable();
- rReq.SetReturnValue(OfaPtrItem(SID_GET_COLORTABLE, pTable));
+ const SvxColorTableItem* pColItem = static_cast< const SvxColorTableItem* >(GetItem(SID_COLOR_TABLE));
+ XColorListSharedPtr aTable = pColItem->GetColorTable();
+
+ rReq.SetReturnValue(SvxColorTableItem(aTable, SID_GET_COLORTABLE));
}
break;