[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/addrbk-datasrc-ordering.diff  |   18 +++---------------
 patches/dev300/sfx-check-real-help-path.diff |   13 +------------
 2 files changed, 4 insertions(+), 27 deletions(-)

New commits:
commit 2ba507e590d3dcee767c01917da0f8c2feb7dc27
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 14:33:20 2011 +0300

    Make addrbk-datasrc-ordering.diff apply again

diff --git a/patches/dev300/addrbk-datasrc-ordering.diff b/patches/dev300/addrbk-datasrc-ordering.diff
index fa895d9..8fd05c1 100644
--- a/patches/dev300/addrbk-datasrc-ordering.diff
+++ b/patches/dev300/addrbk-datasrc-ordering.diff
@@ -1,10 +1,3 @@
----
- dbaccess/source/ui/browser/dbtreeview.cxx |    2 +-
- sw/source/ui/dbui/dbtree.cxx              |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git dbaccess/source/ui/browser/dbtreeview.cxx dbaccess/source/ui/browser/dbtreeview.cxx
-index e3c95e5..920e96c 100644
 --- dbaccess/source/ui/browser/dbtreeview.cxx
 +++ dbaccess/source/ui/browser/dbtreeview.cxx
 @@ -60,7 +60,7 @@ DBTreeView::DBTreeView(	Window* pParent, const Reference< XMultiServiceFactory >
@@ -16,19 +9,14 @@ index e3c95e5..920e96c 100644
      m_pTreeListBox->EnableCheckButton(NULL);
      m_pTreeListBox->SetDragDropMode( 0 );
      m_pTreeListBox->EnableInplaceEditing( sal_True );
-diff --git sw/source/ui/dbui/dbtree.cxx sw/source/ui/dbui/dbtree.cxx
-index 4b31760..37bd962 100644
 --- sw/source/ui/dbui/dbtree.cxx
 +++ sw/source/ui/dbui/dbtree.cxx
 @@ -260,7 +260,7 @@ void SwDBTreeList::InitTreeList()
      if(!pImpl->HasContext() && pImpl->GetWrtShell())
          return;
      SetSelectionMode(SINGLE_SELECTION);
--    SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
-+    SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
-     // Font nicht setzen, damit der Font des Controls uebernommen wird!
+-    SetStyle(GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
++    SetStyle(GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
+     // don't set font, so that the Control's font is being applied!
      SetSpaceBetweenEntries(0);
      SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE),
--- 
-1.7.0.1
-
commit fee97e460cfc889001e2f0a3a2b1f9b2780452d5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 14:31:07 2011 +0300

    Make sfx-check-real-help-path.diff apply again

diff --git a/patches/dev300/sfx-check-real-help-path.diff b/patches/dev300/sfx-check-real-help-path.diff
index 131b6d2..7d702d4 100644
--- a/patches/dev300/sfx-check-real-help-path.diff
+++ b/patches/dev300/sfx-check-real-help-path.diff
@@ -1,10 +1,3 @@
----
- sfx2/source/appl/sfxhelp.cxx           |   19 +++++++++----------
- unotools/source/config/pathoptions.cxx |    6 +++++-
- 2 files changed, 14 insertions(+), 11 deletions(-)
-
-diff --git sfx2/source/appl/sfxhelp.cxx sfx2/source/appl/sfxhelp.cxx
-index d5e6f24..df94b19 100644
 --- sfx2/source/appl/sfxhelp.cxx
 +++ sfx2/source/appl/sfxhelp.cxx
 @@ -53,10 +53,10 @@
@@ -19,12 +12,11 @@ index d5e6f24..df94b19 100644
  #include <ucbhelper/content.hxx>
  #include <unotools/pathoptions.hxx>
  #include <rtl/ustring.hxx>
-@@ -126,13 +126,13 @@ rtl::OUString HelpLocaleString()
+@@ -126,12 +126,13 @@ rtl::OUString HelpLocaleString()
              aLocaleStr = aEnglish;
          else
          {
 -            rtl::OUString aBaseInstallPath;
--            // utl::Bootstrap::PathStatus aBaseLocateResult =
 -            utl::Bootstrap::locateBaseInstallation(aBaseInstallPath);
 -            static const char *szHelpPath = "/help/";
 +            String sBaseHelpPathString;
@@ -68,6 +60,3 @@ index b02f912..f16e68f 100644
          }
  
          m_aPathArray[ ePath ] = aPathValue;
--- 
-1.7.0.1
-