[Libreoffice-commits] .: extensions/source
extensions/source/propctrlr/standardcontrol.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 90879a4bc82f2e23a076275ccdaf7cc4751f56f0
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Sep 26 09:46:17 2011 +0200
Fixed DBG_ASSERT broken by recent commit.
diff --git a/extensions/source/propctrlr/standardcontrol.cxx
b/extensions/source/propctrlr/standardcontrol.cxx
index 83d694d..0e57a86 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -697,7 +697,7 @@ namespace pcr
pColorList = XColorList::GetStdColorList();
-DBG_ASSERT(pColorList, OColorControl::OColorControl: no color
table!);
+DBG_ASSERT(pColorList.is(), OColorControl::OColorControl: no color
table!);
if ( pColorList.is() )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/dlg/tpaction.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 51dcb469c013d3a8a301ca8e86dde3a420b5417f
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Sep 26 11:17:32 2011 +0200
Fixed DBG_ASSERT broken by recent commit.
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 0e64d89..25eeafd 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -189,7 +189,7 @@ void SdTPAction::SetView( const ::sd::View* pSdView )
SvxColorListItem aItem( *(const SvxColorListItem*)( pDocSh-GetItem(
SID_COLOR_TABLE ) ) );
pColList = aItem.GetColorList();
-DBG_ASSERT( pColList, Keine Farbtabelle vorhanden! );
+DBG_ASSERT( pColList.is(), Keine Farbtabelle vorhanden! );
}
else
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - desktop/Executable_quickstart.mk desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executa
desktop/Executable_quickstart.mk |2 ++ desktop/Executable_sbase.mk|2 ++ desktop/Executable_scalc.mk|2 ++ desktop/Executable_sdraw.mk|2 ++ desktop/Executable_simpress.mk |2 ++ desktop/Executable_smath.mk|2 ++ desktop/Executable_soffice.mk |2 ++ desktop/Executable_sweb.mk |2 ++ desktop/Executable_swriter.mk |2 ++ desktop/WinResTarget_quickstart.mk |8 desktop/WinResTarget_sbase.mk | 10 +- desktop/WinResTarget_scalc.mk | 10 +- desktop/WinResTarget_sdraw.mk | 10 +- desktop/WinResTarget_simpress.mk | 10 +- desktop/WinResTarget_smath.mk | 10 +- desktop/WinResTarget_soffice.mk| 10 +- desktop/WinResTarget_sweb.mk | 10 +- desktop/WinResTarget_swriter.mk| 10 +- solenv/gbuild/Executable.mk|1 + solenv/gbuild/Library.mk |1 + solenv/gbuild/platform/windows.mk |6 +++--- solenv/gbuild/platform/winmingw.mk |2 +- 22 files changed, 68 insertions(+), 48 deletions(-) New commits: commit a44020dd9eb7f1607c05869fe5430a2ae68d46f2 Author: David Tardon dtar...@redhat.com Date: Mon Sep 26 12:47:35 2011 +0200 add resource files diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index 6db6870..593ef1f 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -60,4 +60,6 @@ $(eval $(call gb_Executable_add_exception_objects,quickstart,\ desktop/win32/source/QuickStart/QuickStart \ )) +$(eval $(call gb_Executable_add_nativeres,quickstart,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 5cd916b..d5e0991 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -43,4 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sbase,\ desktop/win32/source/applauncher/sbase \ )) +$(eval $(call gb_Executable_add_nativeres,sbase,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index e93aea2..550add6 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -43,4 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,scalc,\ desktop/win32/source/applauncher/scalc \ )) +$(eval $(call gb_Executable_add_nativeres,scalc,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index dc13c41..29fb387 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -43,4 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sdraw,\ desktop/win32/source/applauncher/sdraw \ )) +$(eval $(call gb_Executable_add_nativeres,sdraw,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index 728d8e3..281718c 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -43,4 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,simpress,\ desktop/win32/source/applauncher/simpress \ )) +$(eval $(call gb_Executable_add_nativeres,simpress,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index b7c9307..e8de100 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -43,4 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,smath,\ desktop/win32/source/applauncher/smath \ )) +$(eval $(call gb_Executable_add_nativeres,smath,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 8240ef3..cf142d6 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -50,4 +50,6 @@ $(eval $(call gb_Executable_add_noexception_objects,soffice,\ desktop/win32/source/officeloader/officeloader \ )) +$(eval $(call gb_Executable_add_nativeres,soffice,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 14e9296..67daa62 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -43,4 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sweb,\ desktop/win32/source/applauncher/sweb \ )) +$(eval $(call gb_Executable_add_nativeres,sweb,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index 30e98b1..d38ea6e 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -43,4 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,swriter,\ desktop/win32/source/applauncher/swriter \ )) +$(eval $(call gb_Executable_add_nativeres,swriter,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_quickstart.mk b/desktop/WinResTarget_quickstart.mk index cf518aa..9c3ec14 100644 --- a/desktop/WinResTarget_quickstart.mk +++
[Libreoffice-commits] .: 2 commits - filter/source framework/source
filter/source/msfilter/msocximex.cxx|1
framework/source/uielement/uicommanddescription.cxx | 28 ++--
2 files changed, 14 insertions(+), 15 deletions(-)
New commits:
commit 1da878532e2c821313609fe376df05895f1325a6
Author: Caolán McNamara caol...@redhat.com
Date: Mon Sep 26 12:53:38 2011 +0100
doesn't use a DocShell anymore, so can ditch check for it
diff --git a/filter/source/msfilter/msocximex.cxx
b/filter/source/msfilter/msocximex.cxx
index 19e217e..616df10 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -47,7 +47,6 @@ static char sWW8_form[] = WW-Standard;
SvxMSConvertOCXControls::SvxMSConvertOCXControls( const uno::Reference
frame::XModel rxModel) : mxModel(rxModel)
{
-OSL_ENSURE( pDocSh, No DocShell, Cannot do Controls );
}
SvxMSConvertOCXControls::~SvxMSConvertOCXControls()
commit 9cbc1eb35e2fff63f16a30e2fcc8909c2e566cc2
Author: Caolán McNamara caol...@redhat.com
Date: Mon Sep 26 12:06:22 2011 +0100
WaE: unused e
diff --git a/framework/source/uielement/uicommanddescription.cxx
b/framework/source/uielement/uicommanddescription.cxx
index a338c26..6702612 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -394,10 +394,10 @@ void ConfigurationAccess_UICommand::impl_fill(const
Reference XNameAccess _x
aImageMirrorVector.push_back( aNameSeq[i] );
}
}
-catch ( com::sun::star::lang::WrappedTargetException )
+catch (const com::sun::star::lang::WrappedTargetException)
{
}
-catch ( com::sun::star::container::NoSuchElementException )
+catch (const com::sun::star::container::NoSuchElementException)
{
}
}
@@ -437,11 +437,11 @@ sal_Bool
ConfigurationAccess_UICommand::addGenericInfoToCache()
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST ))) = aCommandNameSeq )
m_aCommandRotateImageList = comphelper::concatSequences
rtl::OUString ( m_aCommandRotateImageList, aCommandNameSeq );
}
-catch ( RuntimeException e )
+catch (const RuntimeException)
{
throw;
}
-catch ( Exception )
+catch (const Exception)
{
}
@@ -451,11 +451,11 @@ sal_Bool
ConfigurationAccess_UICommand::addGenericInfoToCache()
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST ))) = aCommandNameSeq )
m_aCommandMirrorImageList = comphelper::concatSequences
rtl::OUString ( m_aCommandMirrorImageList, aCommandNameSeq );
}
-catch ( RuntimeException e )
+catch (const RuntimeException)
{
throw;
}
-catch ( Exception )
+catch (const Exception)
{
}
@@ -482,19 +482,19 @@ Any ConfigurationAccess_UICommand::getInfoFromCommand(
const rtl::OUString rCom
{
return m_xGenericUICommands-getByName( rCommandURL );
}
-catch ( com::sun::star::lang::WrappedTargetException )
+catch (const com::sun::star::lang::WrappedTargetException)
{
}
-catch ( com::sun::star::container::NoSuchElementException )
+catch (const
com::sun::star::container::NoSuchElementException)
{
}
}
}
}
-catch( com::sun::star::container::NoSuchElementException )
+catch (const com::sun::star::container::NoSuchElementException)
{
}
-catch ( com::sun::star::lang::WrappedTargetException )
+catch (const com::sun::star::lang::WrappedTargetException)
{
}
@@ -537,10 +537,10 @@ Sequence rtl::OUString
ConfigurationAccess_UICommand::getAllCommands()
return aNameSeq;
}
-catch( com::sun::star::container::NoSuchElementException )
+catch (const com::sun::star::container::NoSuchElementException)
{
}
-catch ( com::sun::star::lang::WrappedTargetException )
+catch (const com::sun::star::lang::WrappedTargetException)
{
}
}
@@ -587,10 +587,10 @@ sal_Bool
ConfigurationAccess_UICommand::initializeConfigAccess()
return sal_True;
}
-catch ( WrappedTargetException )
+catch (const WrappedTargetException)
{
}
-catch ( Exception )
+catch (const Exception)
{
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc
binfilter/bf_svx/source/svdraw/svx_svdio.cxx| 186
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx | 11 -
binfilter/inc/bf_svx/svdio.hxx |8 -
3 files changed, 205 deletions(-)
New commits:
commit 097519ecf53e5be95245b3678552726041fb0004
Author: Caolán McNamara caol...@redhat.com
Date: Sat Sep 24 00:34:35 2011 +0100
ditch out of date debugging stuff
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdio.cxx
b/binfilter/bf_svx/source/svdraw/svx_svdio.cxx
index d602a53..65ce7a0 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdio.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdio.cxx
@@ -117,10 +117,6 @@ namespace binfilter {
/*N*/ {
/*N*/ UINT32 nReadAnz(nAktPos - nFilePos);
/*N*/
-/*N*/ #ifdef DBG_UTIL
-/*N*/ ImpCheckRecordIntegrity();
-/*N*/ #endif
-/*N*/
/*N*/ if(nReadAnz != nBlkSize)
/*N*/ {
/*N*/ // FilePos korregieren
@@ -137,10 +133,6 @@ namespace binfilter {
/*N*/ Write();
/*N*/ // und die FilePos restaurieren.
/*N*/ rStream.Seek(nAktPos);
-/*N*/
-/*N*/ #ifdef DBG_UTIL
-/*N*/ ImpCheckRecordIntegrity();
-/*N*/ #endif
/*N*/ }
/*N*/ else
/*N*/ OSL_FAIL(SdrIOHeader::CloseRecord(): Falscher StreamMode
angegeben.);
@@ -208,150 +200,6 @@ namespace binfilter {
/*?*/ return 0;
/*N*/ }
-#ifdef DBG_UTIL
-
-/*N*/ void SdrIOHeader::ImpGetRecordName(ByteString rStr, INT32 nSubRecCount,
-/*N*/ INT32 nSubRecReadCount) const
-/*N*/ {
-/*N*/ rStr = CheckRecordIntegrity (ID=;
-/*N*/ rStr += cMagic[0];
-/*N*/ rStr += cMagic[1];
-/*N*/ rStr += cHdrID[0];
-/*N*/ rStr += cHdrID[1];
-/*N*/ rStr += ')';
-/*N*/
-/*N*/ if(nSubRecCount != -1)
-/*N*/ {
-/*N*/ rStr += (;
-/*N*/
-/*N*/ if(nSubRecReadCount != -1)
-/*N*/ {
-/*N*/ rStr += ByteString_CreateFromInt32( nSubRecReadCount );
-/*N*/ rStr += von ;
-/*N*/ rStr += ByteString_CreateFromInt32( nSubRecCount );
-/*N*/ rStr += Records gelesen);
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ rStr += ByteString_CreateFromInt32( nSubRecCount );
-/*N*/ rStr += Records);
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
-/*N*/ BOOL SdrIOHeader::ImpHasSubRecords() const
-/*N*/ {
-/*N*/ // nicht jeder Record hat SubRecords
-/*N*/ return IsID(SdrIOModlID) ||
-/*N*/ IsID(SdrIOPageID) ||
-/*N*/ IsID(SdrIOMaPgID) ||
-/*N*/ IsID(SdrIODObjID);
-/*N*/ }
-
-// Testet die Integritaet eines Records. Innerhalb eines Records
-// muessen alle Daten in Subrecords (SdrDownCompat) untergebracht sein.
-
-/*N*/ void SdrIOHeader::ImpCheckRecordIntegrity()
-/*N*/ {
-/*N*/ UINT32 nFilePos0(rStream.Tell());
-/*N*/
-/*N*/ if(IsMagic() ImpHasSubRecords())
-/*N*/ {
-/*N*/ // nicht jeder Record hat SubRecords
-/*N*/ // Seek an den Recordanfang
-/*N*/ rStream.Seek(nFilePos);
-/*N*/ Read();
-/*N*/
-/*N*/ // Anzahl der vorhandenen SubRecords
-/*N*/ UINT32 nHasSubRecCount(0);
-/*N*/ // Anzahl der SubRecords bis nFilePos0
-/*N*/ UINT32 nReadSubRecCount(0);
-/*N*/ UINT32 nAktFilePos(rStream.Tell());
-/*N*/ BOOL bFilePos0Hit(nAktFilePos == nFilePos0);
-/*N*/
-/*N*/ while(!rStream.GetError() !rStream.IsEof() nAktFilePos
nFilePos + nBlkSize)
-/*N*/ {
-/*N*/ UINT32 nSubRecSiz;
-/*N*/
-/*N*/ nHasSubRecCount++;
-/*N*/ rStream nSubRecSiz;
-/*N*/ nAktFilePos += nSubRecSiz;
-/*N*/ rStream.Seek(nAktFilePos);
-/*N*/
-/*N*/ if(nAktFilePos = nFilePos0)
-/*N*/ nReadSubRecCount++;
-/*N*/
-/*N*/ if(nAktFilePos == nFilePos0)
-/*N*/ // Aha, nFilePos0 ist ok.
-/*N*/ bFilePos0Hit = TRUE;
-/*N*/ }
-/*N*/
-/*N*/ ByteString aStr;
-/*N*/
-/*N*/ if(nAktFilePos != nFilePos+nBlkSize)
-/*N*/ aStr += - SubRecord-Strukturfehler.\n;
-/*N*/
-/*N*/ if(nFilePos0 nAktFilePos)
-/*N*/ {
-/*?*/ UINT32 nToMuch(nFilePos0 - nAktFilePos);
-/*?*/
-/*?*/ aStr += - ;
-/*?*/
-/*?*/ if(nToMuch == 1)
-/*?*/ aStr += 1 Byte;
-/*?*/ else
-/*?*/ {
-/*?*/ aStr += ByteString_CreateFromInt32( nToMuch );
-/*?*/ aStr += Bytes;
-/*?*/ }
-/*?*/
-/*?*/ aStr += zuviel gelesen.\n;
-/*N*/ }
-
-/*N*/ if(!bFilePos0Hit)
-/*N*/ aStr += - Aktuelle Fileposition liegt nicht am Ende eines
SubRecords.\n;
-/*N*/
-/*N*/ if(aStr.Len())
-/*N*/ {
-/*?*/ ByteString aStr2;
-/*?*/
-/*?*/ aStr.Insert(:\n, 0);
-/*?*/ ImpGetRecordName(aStr2, nHasSubRecCount, nReadSubRecCount);
-/*?*/ aStr.Insert(aStr2, 0);
-/*?*/ OSL_FAIL(aStr.GetBuffer());
-/*N*/ }
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // keine SubRecords vorhanden, also nur FilePos pruefen
-/*N*/ if(nFilePos0
[Libreoffice-commits] .: 2 commits - starmath/source
starmath/source/mathmlimport.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 0be026ea4ae6d53d6cc0e5acb10bd58bec490adc
Author: Caolán McNamara caol...@redhat.com
Date: Mon Sep 26 12:59:36 2011 +0100
= for extra safely I suppose
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index ce1d3c6..568ebb6 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -2461,7 +2461,7 @@ void
SmXMLMultiScriptsContext_Impl::ProcessSubSupPairs(bool bIsPrescript)
{
SmNodeStack rNodeStack = GetSmImport().GetNodeStack();
-if (rNodeStack.Count() == nElementCount)
+if (rNodeStack.Count() = nElementCount)
return;
sal_uLong nCount = rNodeStack.Count() - nElementCount - 1;
commit 30e8dcf0372977d5c6daea949b5cd39b6690fc55
Author: Ivan Timofeev timofeev@gmail.com
Date: Fri Sep 23 22:31:40 2011 +0400
consider empty mmultiscripts
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 9cd36c6..ce1d3c6 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -2461,6 +2461,9 @@ void
SmXMLMultiScriptsContext_Impl::ProcessSubSupPairs(bool bIsPrescript)
{
SmNodeStack rNodeStack = GetSmImport().GetNodeStack();
+if (rNodeStack.Count() == nElementCount)
+return;
+
sal_uLong nCount = rNodeStack.Count() - nElementCount - 1;
if (nCount == 0)
return;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - configure.in post_download.in README.cross
README.cross | 18 ++ configure.in |4 ++-- post_download.in | 36 ++-- 3 files changed, 14 insertions(+), 44 deletions(-) New commits: commit a45732406540e0a3196506e184c00f664084588f Author: Tor Lillqvist t...@iki.fi Date: Mon Sep 26 15:09:10 2011 +0300 Match the Android host_os that the new config.sub produces diff --git a/configure.in b/configure.in index fbc16cc..f1a38b7 100644 --- a/configure.in +++ b/configure.in @@ -1709,7 +1709,7 @@ dragonfly*) _os=DragonFly ;; -androideabi*) +linux-androideabi*) build_gstreamer=no test_cups=no test_fontconfig=no @@ -1723,7 +1723,7 @@ androideabi*) ;; *) -AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice!]) +AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice for!]) ;; esac commit dee0123807b52a0d1438ee3362f6686ec83067f0 Author: Tor Lillqvist t...@iki.fi Date: Mon Sep 26 15:08:03 2011 +0300 Update the sample autogen.lastrun for Android diff --git a/README.cross b/README.cross index 87044e4..5325a4f 100644 --- a/README.cross +++ b/README.cross @@ -274,14 +274,14 @@ available for Linux, MacOSX and Windows. (Trying to cross-compile from Windows will probably drive you insane.) Here is my autogen.lastrun for Android: -SYSBASE=/home/tml/android-ndk-r5c/platforms/android-9/arch-arm -CC=ccache /home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot /home/tml/android-ndk-r5c/platforms/android-9/arch-arm -CXX=ccache /home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r5c/platforms/android-9/arch-arm -I /home/tml/android-ndk-r5c/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r5c/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r5c/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti -AR=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar -NM=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm -OBJDUMP=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump -RANLIB=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ranlib -STRIP=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-strip +SYSBASE=/home/tml/android-ndk-r6/platforms/android-9/arch-arm +CC=ccache /home/tml/android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot /home/tml/android-ndk-r6/platforms/android-9/arch-arm +CXX=ccache /home/tml/android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r6/platforms/android-9/arch-arm -I /home/tml/android-ndk-r6/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r6/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r6/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti +AR=/home/tml/android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar +NM=/home/tml/android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm +OBJDUMP=/home/tml/android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump +RANLIB=/home/tml/android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ranlib +STRIP=/home/tml/android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-strip CC_FOR_BUILD=ccache gcc CXX_FOR_BUILD=ccache g++ --build=x86_64-unknown-linux-gnu @@ -291,6 +291,8 @@ CXX_FOR_BUILD=ccache g++ --disable-python --with-num-cpus=1 --with-max-jobs=1 +--without-helppack-integration +--without-myspell-dicts PowerPC Mac OS X commit 26d092026457398ee23422c5070edca9057e6a25 Author: Tor Lillqvist t...@iki.fi Date: Mon Sep 26 15:05:41 2011 +0300 Simplify diff --git a/post_download.in b/post_download.in index 46d50ce..551f5c1 100644 --- a/post_download.in +++ b/post_download.in @@ -7,46 +7,14 @@ echo * Running the post download checks. echo * echo -dnl === -dnl The following is a list of supported systems. -dnl === AC_CANONICAL_HOST case $host_os in -solaris*) -_os=SunOS -;; -linux-gnu*|k*bsd*-gnu*) -_os=Linux -;; -gnu) -
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/winmingw.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a5729deee5f9b52ef2169791471ea484518680a5 Author: Jan Holesovsky ke...@suse.cz Date: Mon Sep 26 14:19:01 2011 +0200 UNOLIBS_URE are supposed to end with .uno.dll, not only .dll. diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index bceac5e..2187a85 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -495,7 +495,7 @@ gb_Library_DLLFILENAMES :=\ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \ $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTDLLEXT)) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTDLLEXT)) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \ + $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \ $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVERDLLEXT)) \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ucb/source
ucb/source/ucp/webdav/NeonUri.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dd5f1c23331a8dbb4db35472be0a3cc47294feca Author: Tor Lillqvist t...@iki.fi Date: Mon Sep 26 16:03:37 2011 +0300 Do as the comment says: use the pragma for gcc = 4.2.1 diff --git a/ucb/source/ucp/webdav/NeonUri.cxx b/ucb/source/ucp/webdav/NeonUri.cxx index fd88795..5eb0f25 100644 --- a/ucb/source/ucp/webdav/NeonUri.cxx +++ b/ucb/source/ucp/webdav/NeonUri.cxx @@ -52,7 +52,7 @@ using namespace webdav_ucp; + __GNUC_MINOR__ * 100 \ + __GNUC_PATCHLEVEL__) /* Diagnostics pragma was introduced with gcc-4.2.1 */ -#if GCC_VERSION 40201 +#if GCC_VERSION = 40201 #pragma GCC diagnostic ignored -Wwrite-strings #endif #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cppcanvas/source xmloff/source
cppcanvas/source/mtfrenderer/textaction.cxx |4
xmloff/source/core/RDFaImportHelper.cxx |7 ++-
2 files changed, 2 insertions(+), 9 deletions(-)
New commits:
commit 226a5ddda17e4b9c0744b7e3f5203f46a4ba289e
Author: Tor Lillqvist t...@iki.fi
Date: Mon Sep 26 21:35:20 2011 +0300
WaE: control reaches end of non-void function
diff --git a/xmloff/source/core/RDFaImportHelper.cxx
b/xmloff/source/core/RDFaImportHelper.cxx
index 043b9f7..956021c 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -218,11 +218,8 @@ RDFaReader::ReadCURIE(::rtl::OUString const i_rCURIE)
const
}
}
}
-else
-{
-OSL_TRACE( ReadCURIE: invalid CURIE: no prefix );
-return ::rtl::OUString();
-}
+OSL_TRACE( ReadCURIE: invalid CURIE: no prefix );
+return ::rtl::OUString();
}
::std::vector ::rtl::OUString
commit e594b27aa841d2c4a0a1861def8ade092eab6c5f
Author: Tor Lillqvist t...@iki.fi
Date: Mon Sep 26 21:14:13 2011 +0300
WaE: control reaches end of non-void function
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx
b/cppcanvas/source/mtfrenderer/textaction.cxx
index a80306d..ec353ea 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -2286,12 +2286,8 @@ namespace cppcanvas
rState ) );
}
}
-#if defined __GNUC__
-#if __GNUC__ == 4 __GNUC_MINOR__ = 1
// Unreachable; to avoid bogus warning:
return ActionSharedPtr();
-#endif
-#endif
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 3136120275834b17f9ff628273cee169d171566e Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Sep 26 21:22:07 2011 +0200 partially revert 6985b28d533c1324896a1647304499c23e553239 as it breaks the whole idea of testing for bug 20033 diff --git a/configure.in b/configure.in index f1a38b7..6a98396 100644 --- a/configure.in +++ b/configure.in @@ -2552,11 +2552,11 @@ A := \$(wildcard *.a) .PHONY: all all: \$(A:.a=.b) -@echo survived bug20033. + @echo survived bug20033. #dont kill these tabs, you will break the Makefile .PHONY: setup setup: -@touch 1.a 2.a 3.a 4.a 5.a 6.a + @touch 1.a 2.a 3.a 4.a 5.a 6.a define d1 @echo lala \$(1) @@ -2569,9 +2569,9 @@ define d2 endef %.b : %.a -\$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | sha1sum))) \$(if \$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\ -\$(call d1,\$(CHECKSUM)),\ -\$(call d2,\$(CHECKSUM))) + \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | sha1sum))) \$(if \$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\ + \$(call d1,\$(CHECKSUM)),\ + \$(call d2,\$(CHECKSUM))) EOF if test -z `(cd $TESTGMAKEBUG20033 $GNUMAKE setup $GNUMAKE -j)|grep survived`; then no_parallelism_make=YES ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 13 commits - autodoc/source connectivity/workben rsc/source slideshow/source tools/source vcl/source
autodoc/source/display/html/hdimpl.cxx | 11 -
autodoc/source/parser/cpp/cx_c_pp.cxx |4
connectivity/workben/testmoz/main.cxx |2
rsc/source/res/rscflag.cxx | 22 +-
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx |2
tools/source/generic/poly.cxx | 14 -
vcl/source/fontsubset/cff.cxx |2
vcl/source/fontsubset/sft.cxx | 31 ++-
vcl/source/gdi/bitmap3.cxx | 25 +-
vcl/source/gdi/outdev2.cxx | 10 -
vcl/source/gdi/outdev3.cxx |9 -
vcl/source/window/toolbox.cxx | 90
+-
12 files changed, 83 insertions(+), 139 deletions(-)
New commits:
commit 1f1607a5e6ea2b88f072ba2109522de671f20dbf
Author: Pierre-André Jacquod pjacq...@alumni.ethz.ch
Date: Sat Sep 24 18:08:14 2011 +0200
cppcheck: reduce scope of var in rsc rscflag.cxx
diff --git a/rsc/source/res/rscflag.cxx b/rsc/source/res/rscflag.cxx
index aeaf2fd..6e224fc 100644
--- a/rsc/source/res/rscflag.cxx
+++ b/rsc/source/res/rscflag.cxx
@@ -69,10 +69,10 @@ sal_uInt32 RscFlag::Size()
*/
ERRTYPE RscFlag::SetNotConst( const RSCINST rInst, Atom nConst )
{
-sal_uInt32 i = 0, nFlag = 0;
+sal_uInt32 i = 0;
if( nEntries != (i = GetConstPos( nConst )) ){
-nFlag = 1 (i % (sizeof( sal_uInt32 ) * 8) );
+sal_uInt32 nFlag = 1 (i % (sizeof( sal_uInt32 ) * 8) );
i = i / (sizeof( sal_uInt32 ) * 8);
((RscFlagInst *)rInst.pData)[ i ].nFlags = ~nFlag;
((RscFlagInst *)rInst.pData)[ i ].nDfltFlags = ~nFlag;
@@ -89,10 +89,10 @@ ERRTYPE RscFlag::SetNotConst( const RSCINST rInst, Atom
nConst )
*/
ERRTYPE RscFlag::SetConst( const RSCINST rInst, Atom nConst, sal_Int32
/*nVal*/ )
{
-sal_uInt32 i = 0, nFlag = 0;
+sal_uInt32 i = 0;
if( nEntries != (i = GetConstPos( nConst )) ){
-nFlag = 1 (i % (sizeof( sal_uInt32 ) * 8) );
+sal_uInt32 nFlag = 1 (i % (sizeof( sal_uInt32 ) * 8) );
i = i / (sizeof( sal_uInt32 ) * 8);
((RscFlagInst *)rInst.pData)[ i ].nFlags |= nFlag;
((RscFlagInst *)rInst.pData)[ i ].nDfltFlags = ~nFlag;
@@ -129,7 +129,6 @@ RSCINST RscFlag::CreateBasic( RSCINST * pInst )
RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST rDflt, sal_Bool
bOwnClass )
{
RSCINST aInst = CreateBasic( pInst );
-sal_uInt32 i = 0;
if( !bOwnClass rDflt.IsInst() )
bOwnClass = rDflt.pClass-InHierarchy( this );
@@ -138,7 +137,7 @@ RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST
rDflt, sal_Bool bOwnCl
memmove( aInst.pData, rDflt.pData, Size() );
else
{
-for( i = 0; i Size() / sizeof( RscFlagInst ); i++ )
+for( sal_uInt32 i = 0; i Size() / sizeof( RscFlagInst ); i++ )
{
((RscFlagInst *)aInst.pData)[ i ].nFlags = 0;
((RscFlagInst *)aInst.pData)[ i ].nDfltFlags = 0x;
@@ -157,13 +156,14 @@ RSCINST RscFlag::CreateClient( RSCINST * pInst, const
RSCINST rDfltI,
sal_Bool bOwnClass, Atom nConstId )
{
RSCINST aInst = CreateBasic( pInst );
-sal_uInt32 i = 0, nFlag = 0;
+sal_uInt32 i = 0;
if( !bOwnClass rDfltI.IsInst() )
bOwnClass = rDfltI.pClass-InHierarchy( this );
-if( nEntries != (i = GetConstPos( nConstId )) ){
-nFlag = 1 (i % (sizeof( sal_uInt32 ) * 8) );
+if( nEntries != (i = GetConstPos( nConstId )) )
+{
+sal_uInt32 nFlag = 1 (i % (sizeof( sal_uInt32 ) * 8) );
i = i / (sizeof( sal_uInt32 ) * 8);
if( bOwnClass ){
((RscFlagInst *)aInst.pData)[ i ].nFlags =
@@ -251,13 +251,11 @@ sal_Bool RscFlag::IsValueDefault( const RSCINST rInst,
CLASS_DATA pDef,
sal_Bool RscFlag::IsValueDefault( const RSCINST rInst, CLASS_DATA pDef )
{
-sal_uInt32 i = 0;
-
if( pDef ){
sal_uInt32 Flag = 0, nIndex = 0;
Flag = 1;
-for( i = 0; i nEntries; i++ ){
+for( sal_uInt32 i = 0; i nEntries; i++ ){
nIndex = i / (sizeof( sal_uInt32 ) * 8);
if( (((RscFlagInst *)rInst.pData)[ nIndex ].nFlags Flag)
!= (((RscFlagInst *)pDef)[ nIndex ].nFlags Flag) )
commit d04bd631731c45627caa4b7f5dc4aea2c4fa9f9e
Author: Pierre-André Jacquod pjacq...@alumni.ethz.ch
Date: Sat Sep 24 17:58:01 2011 +0200
cppcheck: reduce scope of var in tools/ poly.cxx
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 419575d..4ba1ef0 100644
---
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - sw/source
sw/source/core/layout/newfrm.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit 6a3faed5b459ea133c39ef5243dad8e366ca00c3
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Sep 23 01:13:34 2011 +0200
fdo#39510: comment added
Signed-off-by: Michael Stahl m...@openoffice.org
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 7f19c1a..3943336 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -607,7 +607,17 @@ SwRootFrm::~SwRootFrm()
{
bTurboAllowed = sal_False;
pTurbo = 0;
+// fdo#39510 crash on document close with footnotes
+// Object ownership in writer and esp. in layout are a mess: Before the
+// document/layout split SwDoc and SwRootFrm were essentially one object
+// and magically/uncleanly worked around their common destruction by call
+// to SwDoc::IsInDtor() -- even from the layout. As of now destuction of
+// the layout proceeds forward through the frames. Since SwTxtFtn::DelFrms
+// also searches backwards to find the master of footnotes, they must be
+// considered to be owned by the SwRootFrm and also be destroyed here,
+// before tearing down the (now footnote free) rest of the layout.
AllRemoveFtns();
+
if(pBlink)
pBlink-FrmDelete( this );
if ( static_castSwFrmFmt*(GetRegisteredInNonConst()) )
commit f8f5d9bff5051cc88d06b10d855548a441de
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Thu Sep 22 18:47:21 2011 +0200
fdo#39510 lp#854626: crash on closing document with footnotes
Signed-off-by: Michael Stahl m...@openoffice.org
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 86eefcb..7f19c1a 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -607,6 +607,7 @@ SwRootFrm::~SwRootFrm()
{
bTurboAllowed = sal_False;
pTurbo = 0;
+AllRemoveFtns();
if(pBlink)
pBlink-FrmDelete( this );
if ( static_castSwFrmFmt*(GetRegisteredInNonConst()) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/inc vcl/ios
vcl/inc/ios/vcluiapp.h |1
vcl/ios/source/app/salinst.cxx | 69 +
vcl/ios/source/app/salsys.cxx |2 +
vcl/ios/source/app/vcluiapp.mm |3 +
vcl/ios/source/gdi/salgdi.cxx | 58 ++-
vcl/ios/source/window/salframe.cxx | 26 ++---
vcl/ios/source/window/salmenu.cxx |4 +-
vcl/ios/source/window/salobj.cxx |2 -
8 files changed, 43 insertions(+), 122 deletions(-)
New commits:
commit 36e4ca307cb9f282f72231ae05c210469c31dfc2
Author: Tor Lillqvist t...@iki.fi
Date: Mon Sep 26 21:31:28 2011 +0300
WaE: Silence warnings for the iOS code
No semantic changes, the iOS code still is mostly dummy.
diff --git a/vcl/inc/ios/vcluiapp.h b/vcl/inc/ios/vcluiapp.h
index df4a01e..7707b2b 100644
--- a/vcl/inc/ios/vcluiapp.h
+++ b/vcl/inc/ios/vcluiapp.h
@@ -43,7 +43,6 @@ class IosSalFrame;
-(void)sendSuperEvent:(UIEvent*)pEvent;
-(BOOL)application: (UIApplication*) app openFile: (NSString*)file;
-(void)application: (UIApplication*) app openFiles: (NSArray*)files;
--(void)applicationWillTerminate: (UIApplication *) app;
-(void)addFallbackMenuItem: (UIMenuItem*)pNewItem;
-(void)removeFallbackMenuItem: (UIMenuItem*)pOldItem;
@end
diff --git a/vcl/ios/source/app/salinst.cxx b/vcl/ios/source/app/salinst.cxx
index f95930b..fb5bfb9 100644
--- a/vcl/ios/source/app/salinst.cxx
+++ b/vcl/ios/source/app/salinst.cxx
@@ -74,7 +74,6 @@ extern sal_Bool ImplSVMain();
static int* gpnInit = 0;
static bool bNoSVMain = true;
-static bool bLeftMain = false;
// ---
class IosDelayedSettingsChanged : public Timer
@@ -129,12 +128,13 @@ static void initUIApp()
sal_Bool ImplSVMainHook( int * pnInit )
{
+char sMain[] = main;
gpnInit = pnInit;
bNoSVMain = false;
initUIApp();
-char* pArgv[] = { main, NULL };
+char* pArgv[] = { sMain, NULL };
UIApplicationMain( 1, pArgv, NULL, NULL );
return TRUE; // indicate that ImplSVMainHook is implemented
@@ -588,6 +588,7 @@ void IosSalInstance::DestroyObject( SalObject* pObject )
SalPrinter* IosSalInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter )
{
+(void) pInfoPrinter;
return NULL;
}
@@ -603,6 +604,7 @@ void IosSalInstance::DestroyPrinter( SalPrinter* pPrinter )
void IosSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
{
// ???
+(void) pList;
}
// ---
@@ -633,13 +635,18 @@ XubString IosSalInstance::GetDefaultPrinter()
// ---
SalInfoPrinter* IosSalInstance::CreateInfoPrinter( SalPrinterQueueInfo*
pQueueInfo,
-ImplJobSetup* pSetupData )
+ ImplJobSetup* pSetupData )
{
+(void) pQueueInfo;
+(void) pSetupData;
+
// #i113170# may not be the main thread if called from UNO API
SalData::ensureThreadAutoreleasePool();
SalInfoPrinter* pNewInfoPrinter = NULL;
+
// ???
+
return pNewInfoPrinter;
}
@@ -688,61 +695,7 @@ void* IosSalInstance::GetConnectionIdentifier(
ConnectionIdentifierType rReturn
return (void*);
}
-// We need to re-encode file urls because osl_getFileURLFromSystemPath converts
-// to UTF-8 before encoding non ascii characters, which is not what other apps
expect.
-static rtl::OUString translateToExternalUrl(const rtl::OUString internalUrl)
-{
-rtl::OUString extUrl;
-
-uno::Reference lang::XMultiServiceFactory sm =
comphelper::getProcessServiceFactory();
-if (sm.is())
-{
-uno::Reference beans::XPropertySet pset;
-sm-queryInterface( getCppuType( pset )) = pset;
-if (pset.is())
-{
-uno::Reference uno::XComponentContext context;
-static const rtl::OUString DEFAULT_CONTEXT(
RTL_CONSTASCII_USTRINGPARAM( DefaultContext ) );
-pset-getPropertyValue(DEFAULT_CONTEXT) = context;
-if (context.is())
-extUrl =
uri::ExternalUriReferenceTranslator::create(context)-translateToExternal(internalUrl);
-}
-}
-return extUrl;
-}
-
-// #i104525# many versions of OSX have problems with some URLs:
-// when an app requests OSX to add one of these URLs to the Recent Items list
-// then this app gets killed (TextEdit, Preview, etc. and also OOo)
-static bool isDangerousUrl( const rtl::OUString rUrl )
-{
-// use a heuristic that detects all known cases since there is no official
comment
-// on the exact impact and root cause of the OSX bug
-const int nLen = rUrl.getLength();
-const sal_Unicode* p = rUrl.getStr();
-for( int i = 0; i nLen-3; ++i, ++p ) {
-if( p[0] != '%' )
-continue;
-// escaped percent?
-if( (p[1] == '2') (p[2] == '5') )
-return
