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

[Tor Lillqvist]

 patches/dev300/external-apm-header.diff                   |    2 +-
 patches/dev300/svtools-unsort-template-dialogentries.diff |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit adec31c060b6dc0538308476943a0e7c68a92adf
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 12 14:20:10 2011 +0300

    Fix typo

diff --git a/patches/dev300/external-apm-header.diff b/patches/dev300/external-apm-header.diff
index b4e604b..8049e0c 100644
--- a/patches/dev300/external-apm-header.diff
+++ b/patches/dev300/external-apm-header.diff
@@ -55,7 +55,7 @@ index 43bd280..c113d53 100644
                                     SvStream& rStream,
                                     sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW,
 -                                   sal_uInt16 * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 );
-+                                   sal_uInt32 * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0
++                                   sal_uInt16 * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0
 +                       , WMF_APMFILEHEADER *pAPMHeader = NULL);
  
      sal_uInt16          ImportGraphic( Graphic& rGraphic, const String& rPath,
commit e5eea0e681f7ed8dbeeb1375c3f004a44774cca8
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 12 13:00:16 2011 +0300

    Fix DECLARE_LIST removal fallout

diff --git a/patches/dev300/svtools-unsort-template-dialogentries.diff b/patches/dev300/svtools-unsort-template-dialogentries.diff
index 497f17a..549ee2a 100644
--- a/patches/dev300/svtools-unsort-template-dialogentries.diff
+++ b/patches/dev300/svtools-unsort-template-dialogentries.diff
@@ -145,7 +145,7 @@
 +        {
 +            String aSeparator( ASCII_STR( aSeparatorStr ) );
 +            ::rtl::OUString* pSeparator = new ::rtl::OUString( aSeparator );
-+            aNewDocs.Insert( pSeparator, LIST_APPEND );
++            aNewDocs.push_back( pSeparator );
 +        }
          else
          {