[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/kde4-oxygen-icons.diff |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 64b367032ca3a3ab6478ac7c566f6bc8338ef0c6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 16:26:50 2009 +0300

    Adapt kde4-oxygen-icons.diff for dev300-m54
    
    * patches/dev300/kde4-oxygen-icons.diff: Adapt for dev300-m54.

diff --git a/patches/dev300/kde4-oxygen-icons.diff b/patches/dev300/kde4-oxygen-icons.diff
index 65f3e53..ecd8fb3 100644
--- a/patches/dev300/kde4-oxygen-icons.diff
+++ b/patches/dev300/kde4-oxygen-icons.diff
@@ -116,10 +116,8 @@ index 99a225c..03239dc 100644
  	}
  
  	return STYLE_SYMBOLS_AUTO;
-diff --git svx/source/dialog/optgdlg.cxx svx/source/dialog/optgdlg.cxx
-index d8f1ce8..0409846 100644
---- svx/source/dialog/optgdlg.cxx
-+++ svx/source/dialog/optgdlg.cxx
+--- svx/source/cui/optgdlg.cxx
++++ svx/source/cui/optgdlg.cxx
 @@ -818,5 +818,6 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
              case STYLE_SYMBOLS_CLASSIC:     aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
              case STYLE_SYMBOLS_HICONTRAST:  aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
@@ -142,10 +140,8 @@ index d8f1ce8..0409846 100644
          }
      }
 
-diff --git svx/source/dialog/optgdlg.src svx/source/dialog/optgdlg.src
-index 824b264..1cc912e 100644
---- svx/source/dialog/optgdlg.src
-+++ svx/source/dialog/optgdlg.src
+--- svx/source/cui/optgdlg.src
++++ svx/source/cui/optgdlg.src
 @@ -259,5 +259,6 @@ TabPage OFA_TP_VIEW
              < "Tango" ; > ;
              < "Classic" ; > ;