openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msei...@apache.org
Subject svn commit: r1863989 - in /openoffice/branches/AOO42X: ./ main/default_images/svx/res/ main/ooo_custom_images/classic/ main/svx/source/stbctrls/
Date Tue, 30 Jul 2019 11:28:42 GMT
Author: mseidel
Date: Tue Jul 30 11:28:42 2019
New Revision: 1863989

URL: http://svn.apache.org/viewvc?rev=1863989&view=rev
Log:
Merged r1863970, r1863972 and r1863973 from trunk

Flattened graphics for zoom slider
Renamed graphics for zoom slider
Added "old" graphics for slidecontrol to classic icon set

Added:
    openoffice/branches/AOO42X/main/default_images/svx/res/slidecontrol.png
      - copied unchanged from r1863972, openoffice/trunk/main/default_images/svx/res/slidecontrol.png
    openoffice/branches/AOO42X/main/default_images/svx/res/slidecontrol_h.png
      - copied unchanged from r1863972, openoffice/trunk/main/default_images/svx/res/slidecontrol_h.png
Removed:
    openoffice/branches/AOO42X/main/default_images/svx/res/navigationball_10.png
    openoffice/branches/AOO42X/main/default_images/svx/res/navigationball_10_h.png
Modified:
    openoffice/branches/AOO42X/   (props changed)
    openoffice/branches/AOO42X/main/ooo_custom_images/classic/classic_images.tar.gz
    openoffice/branches/AOO42X/main/svx/source/stbctrls/stbctrls.src

Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 30 11:28:42 2019
@@ -9,4 +9,4 @@
 /openoffice/branches/ia2:1417739-1541842
 /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
 /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857222,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,185
 9839,1860288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567,1861660,1861664-1861665,1861790,1861946,1861956,1862194,1862234,1862415-1862416,1862420,1862666,1862697,1862776,1862940,1862964,1862974,1863005,1863007,1863057,1863087-1863088,1863107,1863135,1863197,1863408,1863510,1863520,1863528,1863573-1863575,1863578,1863688,1863829-1863830,1863873,1863875,1863880,1863883,1863962
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857222,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,185
 9839,1860288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567,1861660,1861664-1861665,1861790,1861946,1861956,1862194,1862234,1862415-1862416,1862420,1862666,1862697,1862776,1862940,1862964,1862974,1863005,1863007,1863057,1863087-1863088,1863107,1863135,1863197,1863408,1863510,1863520,1863528,1863573-1863575,1863578,1863688,1863829-1863830,1863873,1863875,1863880,1863883,1863962,1863970,1863972-1863973

Modified: openoffice/branches/AOO42X/main/ooo_custom_images/classic/classic_images.tar.gz
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/ooo_custom_images/classic/classic_images.tar.gz?rev=1863989&r1=1863988&r2=1863989&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/AOO42X/main/svx/source/stbctrls/stbctrls.src
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/svx/source/stbctrls/stbctrls.src?rev=1863989&r1=1863988&r2=1863989&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/svx/source/stbctrls/stbctrls.src (original)
+++ openoffice/branches/AOO42X/main/svx/source/stbctrls/stbctrls.src Tue Jul 30 11:28:42 2019
@@ -266,7 +266,7 @@ Image RID_SVXBMP_SLIDERBUTTON
 {
 	ImageBitmap = Bitmap
 	{
-		File = "navigationball_10.png" ;
+		File = "slidecontrol.png" ;
 	};
 };
 Image RID_SVXBMP_SLIDERDECREASE
@@ -287,7 +287,7 @@ Image RID_SVXBMP_SLIDERBUTTON_HC
 {
     ImageBitmap = Bitmap
     {
-        File = "navigationball_10_h.png" ;
+        File = "slidecontrol_h.png" ;
     };
 };
 Image RID_SVXBMP_SLIDERDECREASE_HC



Mime
View raw message