[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 2 commits - binfilter/bf_sw filter/source

[Norbert Thiebaud]

 binfilter/bf_sw/source/ui/app/sw_docsh.cxx |    2 +-
 filter/source/svg/exports.map              |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 3c09a06aba6d43b099ffec6a72c8b44be6113310
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Mar 13 19:55:20 2011 -0500

    no more writeInfo

diff --git a/filter/source/svg/exports.map b/filter/source/svg/exports.map
index afb1469..d679dfd 100644
--- a/filter/source/svg/exports.map
+++ b/filter/source/svg/exports.map
@@ -2,7 +2,6 @@ UDK_3_0_0 {
         global:
                 component_getImplementationEnvironment;
                 component_getFactory;
-                component_writeInfo;
                 GraphicImport;
 
         local:
commit 6ede59b3dde6f2a11bd332c5a284e45f996ee649
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Mar 13 19:55:13 2011 -0500

    fix minor macro mis-merge

diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
index 9c32f03..a836c9d 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
@@ -192,7 +192,7 @@ SFX_IMPL_OBJECTFACTORY_DLL(SwDocShell, SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_
         }
         // Fuer's Dokument-Einfuegen noch die FF-Version, wenn's der
         // eigene Filter ist.
-        OSL_ENSURE pRead != ReadSw3 || /*pRead != ReadXML ||*/ pFlt->GetVersion(),
+        DBG_ASSERT(pRead != ReadSw3 || /*pRead != ReadXML ||*/ pFlt->GetVersion(),
                 "Am Filter ist keine FF-Version gesetzt" );
         if( (pRead == ReadSw3 /*|| pRead == ReadXML*/) && pFlt->GetVersion() )
             aStor->SetVersion( (long)pFlt->GetVersion() );