[Libreoffice-commits] .: 29 commits - automation/source basic/inc basic/source comphelper/inc comphelper/Library_comphelp.mk comphelper/Package_inc.mk comphelper/source cui/source desktop/prj desktop/registry desktop/source extensions/source l10ntools/source lotuswordpro/source padmin/source postprocess/packcomponents postprocess/packregistry postprocess/rebase Repository.mk rsc/inc rsc/source scp2/source sd/source sfx2/inc sfx2/source solenv/gbuild svl/inc svl/source svtools/AllLangResTarget_productregistration.mk svtools/Library_productregistration.mk svtools/Module_svtools.mk svtools/source svx/inc svx/source toolkit/source toolkit/src2xml tools/bootstrp tools/inc tools/source ucb/source unotools/inc unotools/Library_utl.mk unotools/Package_inc.mk unotools/source unusedcode.easy vcl/inc vcl/Library_vcl.mk vcl/Package_inc.mk vcl/source vcl/unx wizards/source xmloff/inc xmloff/Library_xo.mk xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Aug 22 01:45:53 PDT 2011
Repository.mk | 1
automation/source/inc/testapp.hxx | 1
automation/source/testtool/objtest.cxx | 31
automation/source/testtool/tcommuni.cxx | 17
basic/inc/basic/basmgr.hxx | 4
basic/source/app/dialogs.cxx | 18
basic/source/basmgr/basmgr.cxx | 34
comphelper/Library_comphelp.mk | 1
comphelper/Package_inc.mk | 1
comphelper/inc/comphelper/componentfactory.hxx | 121 --
comphelper/source/processfactory/componentfactory.cxx | 83 -
cui/source/tabpages/autocdlg.cxx | 2
desktop/prj/build.lst | 1
desktop/registry/data/org/openoffice/Office/Jobs.xcu | 74 -
desktop/registry/data/org/openoffice/Office/makefile.mk | 77 -
desktop/source/app/app.cxx | 1
extensions/source/scanner/sanedlg.cxx | 52 -
l10ntools/source/helpmerge.cxx | 4
l10ntools/source/lngmerge.cxx | 4
l10ntools/source/localize.cxx | 2
lotuswordpro/source/filter/lwpdoc.cxx | 33
lotuswordpro/source/filter/lwpdoc.hxx | 2
lotuswordpro/source/filter/lwpfootnote.cxx | 24
lotuswordpro/source/filter/lwpfootnote.hxx | 2
lotuswordpro/source/filter/lwpfribtable.cxx | 5
lotuswordpro/source/filter/lwpfribtable.hxx | 1
lotuswordpro/source/filter/xfilter/xfsection.cxx | 5
lotuswordpro/source/filter/xfilter/xfsection.hxx | 2
padmin/source/adddlg.cxx | 84 -
postprocess/packcomponents/makefile.mk | 5
postprocess/packregistry/makefile.mk | 4
postprocess/rebase/coffbase.txt | 1
rsc/inc/rscdb.hxx | 2
rsc/source/parser/rscdb.cxx | 8
scp2/source/ooo/file_library_ooo.scp | 2
scp2/source/ooo/file_resource_ooo.scp | 2
scp2/source/ooo/makefile.mk | 4
scp2/source/ooo/module_hidden_ooo.scp | 1
scp2/source/ooo/module_lang_template.scp | 1
sd/source/filter/ppt/pptin.cxx | 8
sfx2/inc/inettbc.hxx | 1
sfx2/inc/pch/precompiled_sfx2.hxx | 1
sfx2/inc/sfx2/dispatch.hxx | 9
sfx2/source/appl/appserv.cxx | 1
sfx2/source/bastyp/mieclip.cxx | 22
sfx2/source/control/dispatch.cxx | 243 ----
sfx2/source/inet/inettbc.cxx | 16
solenv/gbuild/platform/unxgcc.mk | 5
svl/inc/svl/aeitem.hxx | 2
svl/source/items/aeitem.cxx | 21
svtools/AllLangResTarget_productregistration.mk | 48
svtools/Library_productregistration.mk | 65 -
svtools/Module_svtools.mk | 2
svtools/source/config/htmlcfg.cxx | 2
svtools/source/control/ctrltool.cxx | 2
svtools/source/filter/sgvtext.cxx | 2
svtools/source/filter/wmf/winwmf.cxx | 4
svtools/source/misc/imap.cxx | 6
svtools/source/misc/imap2.cxx | 4
svtools/source/misc/transfer.cxx | 20
svtools/source/productregistration/productregistration.cxx | 482 ---------
svtools/source/productregistration/productregistration.hxx | 102 --
svtools/source/productregistration/productregistration.uno.component | 34
svtools/source/productregistration/registrationdlg.cxx | 164 ---
svtools/source/productregistration/registrationdlg.hrc | 43
svtools/source/productregistration/registrationdlg.hxx | 88 -
svtools/source/productregistration/registrationdlg.src | 127 --
svtools/source/svhtml/htmlout.cxx | 6
svtools/source/urlobj/inetimg.cxx | 2
svx/inc/svx/wrapfield.hxx | 1
svx/source/dialog/wrapfield.cxx | 7
svx/source/form/navigatortree.cxx | 47
toolkit/source/awt/vclxtoolkit.cxx | 2
toolkit/src2xml/src.lst | 1
tools/bootstrp/cppdep.cxx | 2
tools/bootstrp/rscdep.cxx | 14
tools/inc/tools/fsys.hxx | 9
tools/source/fsys/comdep.hxx | 2
tools/source/fsys/dirent.cxx | 65 -
tools/source/fsys/unx.cxx | 26
tools/source/inet/inetmsg.cxx | 2
tools/source/stream/strmwnt.cxx | 4
ucb/source/ucp/webdav/ContentProperties.cxx | 28
ucb/source/ucp/webdav/ContentProperties.hxx | 6
unotools/Library_utl.mk | 1
unotools/Package_inc.mk | 1
unotools/inc/unotools/datetime.hxx | 3
unotools/inc/unotools/regoptions.hxx | 122 --
unotools/inc/unotools/ucbhelper.hxx | 12
unotools/inc/unotools/ucblockbytes.hxx | 1
unotools/source/config/itemholder1.cxx | 1
unotools/source/config/lingucfg.cxx | 2
unotools/source/config/regoptions.cxx | 497 ----------
unotools/source/i18n/instance.hxx | 1
unotools/source/i18n/transliterationwrapper.cxx | 1
unotools/source/misc/datetime.cxx | 17
unotools/source/misc/syslocale.cxx | 2
unotools/source/ucbhelper/ucbhelper.cxx | 245 ----
unotools/source/ucbhelper/ucblockbytes.cxx | 9
unusedcode.easy | 45
vcl/Library_vcl.mk | 1
vcl/Package_inc.mk | 1
vcl/inc/unx/salgdi.h | 4
vcl/inc/vcl/svapp.hxx | 2
vcl/inc/vcl/wpropset.hxx | 69 -
vcl/source/app/settings.cxx | 2
vcl/source/app/svapp.cxx | 33
vcl/source/gdi/cvtsvm.cxx | 8
vcl/source/gdi/metaact.cxx | 4
vcl/source/gdi/outdev3.cxx | 2
vcl/source/window/wpropset.cxx | 350 -------
vcl/unx/generic/app/i18n_cb.cxx | 2
vcl/unx/generic/gdi/gcach_xpeer.cxx | 10
vcl/unx/generic/gdi/gcach_xpeer.hxx | 1
vcl/unx/generic/gdi/salgdi3.cxx | 358 -------
vcl/unx/generic/plugadapt/salplug.cxx | 2
vcl/unx/generic/printer/printerinfomanager.cxx | 2
wizards/source/importwizard/DialogModul.xba | 26
wizards/source/importwizard/ImportDialog.xdl | 38
wizards/source/importwizard/Language.xba | 4
wizards/source/importwizard/Main.xba | 28
wizards/source/importwizard/importwi.src | 24
xmloff/Library_xo.mk | 1
xmloff/inc/xmloff/formlayerexport.hxx | 13
xmloff/inc/xmloff/formlayerimport.hxx | 27
xmloff/source/draw/sdxmlimp.cxx | 2
xmloff/source/forms/formlayerexport.cxx | 12
xmloff/source/forms/formlayerimport.cxx | 6
xmloff/source/forms/formstyles.cxx | 68 -
xmloff/source/forms/formstyles.hxx | 74 -
xmloff/source/forms/layerexport.cxx | 7
xmloff/source/forms/layerexport.hxx | 4
xmloff/source/forms/layerimport.cxx | 9
xmloff/source/forms/layerimport.hxx | 5
xmloff/source/text/txtimppr.cxx | 2
135 files changed, 284 insertions(+), 4342 deletions(-)
New commits:
commit acfe7d39e5359483124b79fc7e98fb9afa65c0a6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 22 09:02:21 2011 +0100
regoptions (etc.) now unused post registration-removal
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 786ca4d..611234f 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -152,7 +152,6 @@
#include <svtools/apearcfg.hxx>
#include <unotools/misccfg.hxx>
#include <svtools/filter.hxx>
-#include <unotools/regoptions.hxx>
#include "langselect.hxx"
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx
index 60db658..1a4b466 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -406,32 +406,13 @@ void LwpDocument::ParseDocContent(IXFStream* pOutputStream)
LwpObject* pLayoutObj = pDivInfo->GetInitialLayoutID()->obj();
if(pLayoutObj==NULL)
{
- //Cause crash when parsing master document, master document not supported now.
- //ParseMasterDoc(pOutputStream);
+ //master document not supported now.
return;
}
pLayoutObj->SetFoundry(m_pFoundry);
pLayoutObj->Parse(pOutputStream);
}
-/**
- * @descr Parse master doc in this division to IXFStream
- *
- */
-void LwpDocument::ParseMasterDoc(IXFStream* pOutputStream)
-{
- LwpDivInfo* pDivInfo = dynamic_cast<LwpDivInfo*> (m_DivInfo.obj());
- if(pDivInfo==NULL) return;
- LwpAtomHolder* pExternal = pDivInfo->GetExternalName();
- if(pExternal && pExternal->HasValue())
- {
- OUString linkedfilepath = pExternal->str();
- OUString fileURL = LwpTools::convertToFileUrl(OUStringToOString(linkedfilepath, osl_getThreadTextEncoding()));
- XFSection* pSection = new XFSection();
- pSection->SetSourceLink( fileURL);
- pSection->ToXml(pOutputStream);
- delete pSection;
- }
-}
+
/**
* @descr Get the footnoteoptions from the root document
*/
@@ -712,15 +693,7 @@ sal_uInt16 LwpDocument::GetNumberOfPagesBefore()
pRoot->GetNumberOfPages(this,nPageNumber);
return nPageNumber;
}
- /**
- * @descr Get the numbers of page before this division
- */
- sal_uInt16 LwpDocument::GetMaxNumberOfPages()
-{
- sal_uInt16 nPageNumber = 0;
- MaxNumberOfPages(nPageNumber);
- return nPageNumber;
-}
+
/**
* @descr Get Max number of pages
*/
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx b/lotuswordpro/source/filter/lwpdoc.hxx
index 92b41c3..a920e64 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -141,7 +141,6 @@ protected:
void RegisterLinenumberStyles();
void RegisterFootnoteStyles();
void RegisterDefaultParaStyles();
- void ParseMasterDoc(IXFStream* pOutputStream);
public:
void Parse(IXFStream* pOutputStream);
@@ -178,7 +177,6 @@ public:
LwpDocument* GetFirstDivision();
LwpVirtualLayout* GetEnSuperTableLayout();
sal_Bool GetNumberOfPages(LwpDocument* pEndDivision, sal_uInt16& nCount);
- sal_uInt16 GetMaxNumberOfPages();
sal_uInt16 GetNumberOfPagesBefore();
void ParseFrameInPage(IXFStream* pOutputStream);
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx
index 686c7d3..dd399c2 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -382,30 +382,6 @@ LwpEnSuperTableLayout* LwpFootnote::FindFootnoteTableLayout()
}
/**
- * @descr Find footnote table, not used now
- */
-LwpTable* LwpFootnote::FindFootnoteTable()
-{
- LwpEnSuperTableLayout* pLayout = FindFootnoteTableLayout();
- //if (!ShouldBeInTable(Footnote)) return NULL;
- return GetFootnoteTable(pLayout);
-}
-
-/**
- * @descr Find footnote table, not used now
- */
-LwpTable* LwpFootnote::GetFootnoteTable(LwpEnSuperTableLayout * pLayout)
-{
- if(pLayout)
- {
- LwpEndnoteLayout* pEndnoteLayout = static_cast<LwpEndnoteLayout*>(pLayout->GetMainTableLayout());
- if(pEndnoteLayout)
- return dynamic_cast<LwpTable*>(pEndnoteLayout->GetContent()->obj());
- }
- return NULL;
-}
-
-/**
* @descr Find footnote contents
*/
LwpContent* LwpFootnote::FindFootnoteContent()
diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx b/lotuswordpro/source/filter/lwpfootnote.hxx
index 054b126..8eb8b54 100644
--- a/lotuswordpro/source/filter/lwpfootnote.hxx
+++ b/lotuswordpro/source/filter/lwpfootnote.hxx
@@ -145,8 +145,6 @@ private:
LwpDocument* GetFootnoteTableDivision();
LwpDocument* GetEndnoteDivision(LwpDocument* pPossible);
LwpEnSuperTableLayout* FindFootnoteTableLayout();
- LwpTable* FindFootnoteTable();
- LwpTable* GetFootnoteTable(LwpEnSuperTableLayout* pLayout);
LwpContent* FindFootnoteContent();
OUString GetTableClass();
};
diff --git a/lotuswordpro/source/filter/lwpfribtable.cxx b/lotuswordpro/source/filter/lwpfribtable.cxx
index 67c320f..33e3cfe 100644
--- a/lotuswordpro/source/filter/lwpfribtable.cxx
+++ b/lotuswordpro/source/filter/lwpfribtable.cxx
@@ -94,11 +94,6 @@ void LwpFribTable::RegisterNewStyle()
}
}
-void LwpFribTable::Parse(IXFStream* pOutputStream)
-{
- GetSuperTable()->Parse(pOutputStream);
-}
-
void LwpFribTable::XFConvert(XFContentContainer* pCont)
{
XFContentContainer* pXFContentContainer = pCont;
diff --git a/lotuswordpro/source/filter/lwpfribtable.hxx b/lotuswordpro/source/filter/lwpfribtable.hxx
index 20f3122..5d624fe 100644
--- a/lotuswordpro/source/filter/lwpfribtable.hxx
+++ b/lotuswordpro/source/filter/lwpfribtable.hxx
@@ -67,7 +67,6 @@ public:
void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
LwpSuperTableLayout* GetSuperTable();
void RegisterNewStyle();
- void Parse(IXFStream* pOutputStream);
virtual void XFConvert(XFContentContainer* pCont);
private:
LwpObjectID m_objTable;
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.cxx b/lotuswordpro/source/filter/xfilter/xfsection.cxx
index 2702677..dc31822 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.cxx
@@ -75,11 +75,6 @@ void XFSection::SetSectionName(rtl::OUString name)
m_strSectionName = name;
}
-void XFSection::SetSourceLink( rtl::OUString link)
-{
- m_strSourceLink = link;
-}
-
void XFSection::SetProtected(sal_Bool bProtected)
{
m_bProtected = bProtected;
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.hxx b/lotuswordpro/source/filter/xfilter/xfsection.hxx
index cc700a9..e2ae2e9 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.hxx
@@ -82,8 +82,6 @@ public:
*/
void SetSectionName(rtl::OUString name);
- void SetSourceLink(rtl::OUString link);
-
/**
* @descr Set protected.
*/
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index f0a7340..abc2e55 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -51,7 +51,6 @@ private:
DECL_LINK( OpenHdl, void* );
DECL_LINK( SelectHdl, void* );
- DECL_LINK( WindowEventListener, VclSimpleEvent* );
struct ExecuteInfo
{
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index f5a7c5a..6fcc0d0 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -548,7 +548,6 @@
#include "svtools/printoptions.hxx"
#include "unotools/printwarningoptions.hxx"
#include "svl/rectitem.hxx"
-#include "unotools/regoptions.hxx"
#include "unotools/saveopt.hxx"
#include "unotools/searchopt.hxx"
#include "unotools/securityoptions.hxx"
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index b312035..d0b0ba7 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -77,7 +77,6 @@
#include <unotools/pathoptions.hxx>
#include <unotools/moduleoptions.hxx>
-#include <unotools/regoptions.hxx>
#include <svtools/helpopt.hxx>
#include <svtools/miscopt.hxx>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 9504049..2986de1 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -211,22 +211,6 @@ IMPL_LINK( SfxURLToolBoxControl_Impl, OpenHdl, void*, EMPTYARG )
return 1L;
}
-IMPL_LINK( SfxURLToolBoxControl_Impl, WindowEventListener, VclSimpleEvent*, pEvent )
-{
- if ( pAccExec &&
- pEvent &&
- pEvent->ISA( VclWindowEvent ) &&
- ( pEvent->GetId() == VCLEVENT_WINDOW_KEYINPUT ))
- {
- VclWindowEvent* pWinEvent = static_cast< VclWindowEvent* >( pEvent );
- KeyEvent* pKeyEvent = static_cast< KeyEvent* >( pWinEvent->GetData() );
-
- pAccExec->execute( pKeyEvent->GetKeyCode() );
- }
-
- return 1;
-}
-
//***************************************************************************
void SfxURLToolBoxControl_Impl::StateChanged
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index 617169f..54b22c7 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -108,7 +108,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
unotools/source/config/optionsdlg \
unotools/source/config/pathoptions \
unotools/source/config/printwarningoptions \
- unotools/source/config/regoptions \
unotools/source/config/saveopt \
unotools/source/config/searchopt \
unotools/source/config/securityoptions \
diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk
index a616cf9..d5958aa 100644
--- a/unotools/Package_inc.mk
+++ b/unotools/Package_inc.mk
@@ -87,7 +87,6 @@ $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/propertysethelper.hx
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/propertysetinfo.hxx,unotools/propertysetinfo.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/querydeep.hxx,unotools/querydeep.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/readwritemutexguard.hxx,unotools/readwritemutexguard.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/regoptions.hxx,unotools/regoptions.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/regpathhelper.hxx,unotools/regpathhelper.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/saveopt.hxx,unotools/saveopt.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/searchopt.hxx,unotools/searchopt.hxx))
diff --git a/unotools/inc/unotools/regoptions.hxx b/unotools/inc/unotools/regoptions.hxx
deleted file mode 100644
index 639e08a..0000000
--- a/unotools/inc/unotools/regoptions.hxx
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef unotools_REGOPTIONS_HXX
-#define unotools_REGOPTIONS_HXX
-
-#include "unotools/unotoolsdllapi.h"
-#include <tools/string.hxx>
-
-//........................................................................
-namespace utl
-{
-//........................................................................
-
- //====================================================================
- //= RegOptions
- //====================================================================
- class RegOptionsImpl;
- /** encapsulates access to the configuration settings for registering the product
- */
- class UNOTOOLS_DLLPUBLIC RegOptions
- {
- private:
- RegOptionsImpl* m_pImpl;
-
- // the impl class is constructed upon need only (as this is expensive)
- UNOTOOLS_DLLPRIVATE void ensureImpl( );
-
- public:
- RegOptions( );
- ~RegOptions( );
-
- // retrieves the URL which should be used for online registration
- String getRegistrationURL( ) const;
-
- enum DialogPermission
- { // the registration dialog shall be executed ....
- dpDisabled, // ... never - it has been disabled
- dpNotThisSession, // ... later - no statement when, but _not now_
- dpRemindLater, // ... later at a reminder date
- dpThisSession // ... during this session
- };
-
- /** checks if the registration dialog is allowed
- <p>A return value of <TRUE/> does not mean that during this session, the dialog is allowed to
- be executed. It simply means executing it is allowed <em>in general</em></p>
- */
- DialogPermission getDialogPermission( ) const;
-
- /** claims that the current session is done with respect to the registration dialog.
-
- <p>This is not to be called if <method>getDialogPermission</method> returned dpDisabled previously<p>
- <p>The behaviour changes as follows:
- <ul>
- <li>any subsequent calls to <method>getDialogPermission</method> will return dpNotThisSession, given
- that it previously returned dpNotThisSession</li>
- <li>any subsequent calls to <method>getDialogPermission</method> will return dpDisabled, given
- that it previously returned dpThisSession</li>
- <li>an internal (persistent) session counter is updated, so that during the next session,
- <method>getDialogPermission</method> <em>may</em> return dpThisSession</li>
- </ul></p>
- */
- void markSessionDone( );
-
- /** activates the reminder
-
- <p>If this method is called, the reminder for the dialog will be activated.
- This means that during the next <arg>_nDaysFromNow</arg>-1 days,
- <method>getDialogPermission</method> will return dpRemindLater</p>,
- at the <arg>_nDaysFromNow</arg>th day from today onwards it will
- return dpThisSession.</p>
-
- <p>It is not allowed to call this method if the dialog is currently disabled.</p>
-
- <p>If the current session has not been marked as done already
- (i.e., <method>markSessionDone</method> has not been called, yet), this is
- done implicitly when you call <method>activateReminder</method>.</p>
- */
- void activateReminder( sal_Int32 _nDaysFromNow );
- };
-
-//........................................................................
-} // namespace utl
-//........................................................................
-
-#endif // unotools_REGOPTIONS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx
index 298144c..ee96bc8 100644
--- a/unotools/source/config/itemholder1.cxx
+++ b/unotools/source/config/itemholder1.cxx
@@ -57,7 +57,6 @@
#include <unotools/moduleoptions.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/printwarningoptions.hxx>
-#include <unotools/regoptions.hxx>
#include <unotools/optionsdlg.hxx>
#include <unotools/saveopt.hxx>
#include <unotools/searchopt.hxx>
diff --git a/unotools/source/config/regoptions.cxx b/unotools/source/config/regoptions.cxx
deleted file mode 100644
index cb6134a..0000000
--- a/unotools/source/config/regoptions.cxx
+++ /dev/null
@@ -1,473 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_unotools.hxx"
-#include <unotools/regoptions.hxx>
-#include <unotools/confignode.hxx>
-#include <tools/date.hxx>
-#include <comphelper/processfactory.hxx>
-#include <osl/mutex.hxx>
-#include <unotools/bootstrap.hxx>
-#include <rtl/ustring.hxx>
-#include <rtl/instance.hxx>
-
-//........................................................................
-namespace utl
-{
-//........................................................................
-
- using namespace ::com::sun::star::uno;
-
- //====================================================================
- //= local helpers
- //====================================================================
- //--------------------------------------------------------------------
- /** converts a string representation of a date into a integer representation
- <p>No semantic check is made, i.e. if the string describes the 40.12, this is not recognized. In opposite,
- the string must have a valid structure (DD.MM.YYYY).</p>
- @return
- the integer representation of the date which can be used with the Date class,
- or 0 if the given string was no valid date representation
- */
- static sal_Int32 lcl_convertString2Date( const ::rtl::OUString& _rStringRep )
- {
- sal_Int32 nDateIntRep = 0;
- if ( _rStringRep.getLength() == 2 + 1 + 2 + 1 + 4 ) // DD.MM.YYYY
- {
- // validate the string
- sal_Bool bValid = sal_True;
-
- const sal_Unicode* pStringRep = _rStringRep.getStr();
- sal_Int32 nLen = _rStringRep.getLength();
- for ( sal_Int32 nPos = 0;
- bValid && ( nPos < nLen );
- ++nPos, ++pStringRep
- )
- {
- if ( ( 2 == nPos ) || ( 5 == nPos ) )
- bValid = '.' == *pStringRep; // the number separators
- else
- bValid = ( *pStringRep >= '0' ) && ( *pStringRep <= '9' );
- }
-
- // passed the test?
- if ( bValid )
- {
- Date aDate;
- aDate.SetDay ( (sal_uInt16)_rStringRep.copy( 0, 2 ).toInt32( ) );
- aDate.SetMonth ( (sal_uInt16)_rStringRep.copy( 3, 2 ).toInt32( ) );
- aDate.SetYear ( (sal_uInt16)_rStringRep.copy( 6, 4 ).toInt32( ) );
- nDateIntRep = aDate.GetDate();
- }
- }
-
- return nDateIntRep;
- }
-
- //--------------------------------------------------------------------
- static const ::rtl::OUString& lcl_fillToken( const sal_Int32 /* [in] */ _nToken, const sal_Int16 /* [in] */ _nDigits, ::rtl::OUString& /* [out] */ _rToken )
- {
- // convert into string
- ::rtl::OUString sLeanToken = ::rtl::OUString::valueOf( _nToken );
- // check length
- if ( sLeanToken.getLength() < _nDigits )
- { // fill
- OSL_ENSURE( _nDigits <= 4, "lcl_fillToken: invalid digit number!" );
- _rToken = ::rtl::OUString( "0000", _nDigits - sLeanToken.getLength(), RTL_TEXTENCODING_ASCII_US );
- _rToken += sLeanToken;
- }
- else
- _rToken = sLeanToken;
-
- return _rToken;
- }
-
- //--------------------------------------------------------------------
- /** converts a integer representation of a date into a string representation
- */
- static ::rtl::OUString lcl_ConvertDate2String( const Date& _rDate )
- {
- OSL_ENSURE( _rDate.IsValid(), "lcl_ConvertDate2String: invalid integer representation!" );
-
- sal_Unicode cSeparator( '.' );
- ::rtl::OUString sSeparator( &cSeparator, 1 );
-
- ::rtl::OUString sStringRep;
- ::rtl::OUString sToken;
- sStringRep += lcl_fillToken( (sal_Int32)_rDate.GetDay(), 2, sToken );
- sStringRep += sSeparator;
- sStringRep += lcl_fillToken( (sal_Int32)_rDate.GetMonth(), 2, sToken );
- sStringRep += sSeparator;
- sStringRep += lcl_fillToken( (sal_Int32)_rDate.GetYear(), 4, sToken );
-
- return sStringRep;
- }
-
- //--------------------------------------------------------------------
- /// checks whether a given trigger date is reached (i.e. is _before_ the current date)
- static sal_Bool lcl_reachedTriggerDate( const Date& _rTriggerDate )
- {
- return _rTriggerDate <= Date();
- }
-
- //--------------------------------------------------------------------
- #define DECLARE_STATIC_LAZY_USTRING( name ) \
- static const ::rtl::OUString& lcl_get##name##Name() \
- { \
- static const ::rtl::OUString sName(RTL_CONSTASCII_USTRINGPARAM( #name )); \
- return sName; \
- }
-
- DECLARE_STATIC_LAZY_USTRING( ReminderDate );
- DECLARE_STATIC_LAZY_USTRING( RequestDialog );
- DECLARE_STATIC_LAZY_USTRING( ShowMenuItem );
- DECLARE_STATIC_LAZY_USTRING( Patch );
-
- //====================================================================
- //= RegOptionsImpl
- //====================================================================
- class RegOptionsImpl
- {
- private:
- OConfigurationTreeRoot m_aRegistrationNode; // the configuration node we need to access our persistent data
-
- String m_sRegistrationURL; // the URL to use when doing an online registration
- Date m_aReminderDate; // the reminder date as found in the configuration
- sal_Int32 m_nDialogCounter; // the dialog counter - see getDialogPermission
- sal_Bool m_bShowMenuItem; // the flag indicating if the registration menu item is allowed
-
- static RegOptionsImpl* s_pSingleInstance; // the one and only instance of this class
- static sal_Int32 s_nInstanceCount; // reference counter for the instances
- static sal_Bool s_bThisSessionDone; // the flag indicating if for this session, everything beeing relevant has already been done
-
- private:
- RegOptionsImpl( );
-
- static ::osl::Mutex& getStaticMutex(); // get the mutex used to protect the static members of this class
-
- void commit( );
- sal_Int32 getBuildId() const;
-
- private:
- RegOptions::DialogPermission implGetDialogPermission( ) const;
-
- public:
- static RegOptionsImpl* registerClient( );
- static void revokeClient( );
-
- inline sal_Bool hasURL( ) const { return ( 0 != m_sRegistrationURL.Len() ); }
- inline String getRegistrationURL( ) const { return m_sRegistrationURL; }
-
- RegOptions::DialogPermission getDialogPermission( ) const;
- void markSessionDone( );
- void activateReminder( sal_Int32 _nDaysFromNow );
- void removeReminder();
- };
-
- //--------------------------------------------------------------------
- RegOptionsImpl* RegOptionsImpl::s_pSingleInstance = NULL;
- sal_Bool RegOptionsImpl::s_bThisSessionDone = sal_False;
- sal_Int32 RegOptionsImpl::s_nInstanceCount = 0;
-
- namespace
- {
- class theRegOptionsImplMutex : public rtl::Static<osl::Mutex, theRegOptionsImplMutex>{};
- }
-
- //--------------------------------------------------------------------
- ::osl::Mutex& RegOptionsImpl::getStaticMutex()
- {
- return theRegOptionsImplMutex::get();
- }
-
- //--------------------------------------------------------------------
- void RegOptionsImpl::commit( )
- {
- m_aRegistrationNode.commit( );
- }
-
- //--------------------------------------------------------------------
- RegOptionsImpl* RegOptionsImpl::registerClient( )
- {
- ::osl::MutexGuard aGuard( getStaticMutex() );
-
- if ( !s_pSingleInstance )
- s_pSingleInstance = new RegOptionsImpl;
-
- ++s_nInstanceCount;
- return s_pSingleInstance;
- }
-
- //--------------------------------------------------------------------
- void RegOptionsImpl::revokeClient( )
- {
- ::osl::MutexGuard aGuard( getStaticMutex() );
- OSL_ENSURE( s_nInstanceCount, "RegOptionsImpl::revokeClient: there are no clients alive!" );
- OSL_ENSURE( s_pSingleInstance || !s_nInstanceCount, "RegOptionsImpl::revokeClient: invalid instance pointer!" );
-
- if ( s_nInstanceCount )
- {
- if ( s_pSingleInstance )
- // commit the changes done by this client
- s_pSingleInstance->commit();
-
- if ( 0 == --s_nInstanceCount )
- {
- delete s_pSingleInstance;
- s_pSingleInstance = NULL;
- }
- }
- }
-
- //--------------------------------------------------------------------
- RegOptionsImpl::RegOptionsImpl( )
- :m_nDialogCounter ( 0 )
- ,m_bShowMenuItem ( sal_False )
- {
- // create the config node for all our registration information
- m_aRegistrationNode = OConfigurationTreeRoot::createWithServiceFactory(
- ::comphelper::getProcessServiceFactory(),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common/Help/Registration"))
- );
-
- // cache some data
- //the URL to use for online registration
- ::rtl::OUString sStringValue;
- m_aRegistrationNode.getNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ) >>= sStringValue;
- m_sRegistrationURL = sStringValue;
-
- // the state of the dialog
- m_aRegistrationNode.getNodeValue( lcl_getRequestDialogName() ) >>= m_nDialogCounter;
-
- // the flag for showing the menu item
- sal_Bool bBoolValue = sal_False;
- m_aRegistrationNode.getNodeValue( lcl_getShowMenuItemName() ) >>= bBoolValue;
- m_bShowMenuItem = bBoolValue;
-
- // the reminder date (if any)
- sal_Int32 nIntDate = 0;
- sStringValue = ::rtl::OUString();
- m_aRegistrationNode.getNodeValue( lcl_getReminderDateName() ) >>= sStringValue;
- bool bIsPatchDate = ( sStringValue.equals( lcl_getPatchName() ) != sal_False );
- if ( !bIsPatchDate && sStringValue.getLength() )
- nIntDate = lcl_convertString2Date( sStringValue );
- m_aReminderDate.SetDate( nIntDate );
- }
-
- //--------------------------------------------------------------------
- RegOptions::DialogPermission RegOptionsImpl::implGetDialogPermission( ) const
- {
- RegOptions::DialogPermission eResult = RegOptions::dpDisabled;
- // no URL or a counter already decreased to zero means the dialog is disabled
- if ( hasURL() && ( m_nDialogCounter > 0 ) )
- {
- // during every session, the counter will be decreased
- // If it reaches zero, the dialog shall be executed
- if ( 1 == m_nDialogCounter )
- {
- if ( m_aReminderDate.IsValid( ) )
- { // valid reminder date
- // assume remind later
- eResult = RegOptions::dpRemindLater;
- // and check if we reached the reminder date
- if ( lcl_reachedTriggerDate( m_aReminderDate ) )
- eResult = RegOptions::dpThisSession;
- }
- else
- eResult = RegOptions::dpThisSession; // execute in this session
- }
- else
- eResult = RegOptions::dpNotThisSession; // first trigger session not reached
-
- // a last check ....
- if ( ( s_bThisSessionDone ) // this session is already marked as "done"
- && ( RegOptions::dpThisSession == eResult )// but without this, the state would be "now"
- )
- eResult = RegOptions::dpDisabled; // -> change state to "disabled"
- }
-
- return eResult;
- }
-
- //--------------------------------------------------------------------
- RegOptions::DialogPermission RegOptionsImpl::getDialogPermission( ) const
- {
- OSL_ENSURE( !s_bThisSessionDone, "RegOptionsImpl::getDialogPermission: should never be asked in this session, again!" );
- // Somebody already marked this session as "everything relevant happened". So why sombody (else?) asks
- // me again?
-
- return implGetDialogPermission( );
- }
-
- //--------------------------------------------------------------------
- void RegOptionsImpl::activateReminder( sal_Int32 _nDaysFromNow )
- {
- OSL_ENSURE( s_bThisSessionDone || ( implGetDialogPermission( ) != RegOptions::dpDisabled ), "RegOptionsImpl::activateReminder: invalid call!" );
- OSL_ENSURE( _nDaysFromNow > 0, "RegOptionsImpl::activateReminder: invalid argument!" );
-
- // calc the reminder
- m_aReminderDate = Date() + _nDaysFromNow; // today (default ctor) + days
-
- // remember the date
- m_aRegistrationNode.setNodeValue(
- lcl_getReminderDateName(),
- makeAny( lcl_ConvertDate2String( m_aReminderDate ) )
- );
- // to be on the save side, write the counter
- m_aRegistrationNode.setNodeValue(
- lcl_getRequestDialogName(),
- makeAny( (sal_Int32)1 )
- );
-
- // mark this session as done
- if ( !s_bThisSessionDone )
- markSessionDone( );
- }
-
- //--------------------------------------------------------------------
- void RegOptionsImpl::removeReminder()
- {
- ::rtl::OUString aDefault;
- ::rtl::OUString aReminderValue( lcl_getPatchName() );
- aReminderValue += ::rtl::OUString::valueOf(getBuildId());
-
- m_aRegistrationNode.setNodeValue(
- lcl_getReminderDateName(),
- Any( aReminderValue )
- );
- }
-
- //--------------------------------------------------------------------
- sal_Int32 RegOptionsImpl::getBuildId() const
- {
- sal_Int32 nBuildId( 0 );
- ::rtl::OUString aDefault;
- ::rtl::OUString aBuildIdData = utl::Bootstrap::getBuildIdData( aDefault );
- sal_Int32 nIndex1 = aBuildIdData.indexOf(':');
- sal_Int32 nIndex2 = aBuildIdData.indexOf(')');
- if (( nIndex1 > 0 ) && ( nIndex2 > 0 ) && ( nIndex2-1 > nIndex1+1 ))
- {
- ::rtl::OUString aBuildId = aBuildIdData.copy( nIndex1+1, nIndex2-nIndex1-1 );
- nBuildId = aBuildId.toInt32();
- }
-
- return nBuildId;
- }
-
- //--------------------------------------------------------------------
- void RegOptionsImpl::markSessionDone( )
- {
- OSL_ENSURE( !s_bThisSessionDone, "RegOptionsImpl::markSessionDone: already marked!" );
- OSL_ENSURE( implGetDialogPermission( ) != RegOptions::dpDisabled, "RegOptionsImpl::markSessionDone: invalid call!" );
- if ( !s_bThisSessionDone )
- {
- RegOptions::DialogPermission eOldPermission = implGetDialogPermission( );
-
- s_bThisSessionDone = sal_True;
-
- if ( RegOptions::dpRemindLater == eOldPermission )
- { // no action required. If we shall remind later, the counter is already at 1, we should not change this,
- // as the next smaller number (which is 0 :) means that the dialog would be disabled
- OSL_ENSURE( 1 == m_nDialogCounter, "RegOptionsImpl::markSessionDone: invalid session counter (1)!" );
- }
- else
- {
- OSL_ENSURE( m_nDialogCounter > 0, "RegOptionsImpl::markSessionDone: invalid session counter (2)!" );
- --m_nDialogCounter;
-
- // decrease the session counter
- m_aRegistrationNode.setNodeValue(
- lcl_getRequestDialogName(),
- makeAny( (sal_Int32)m_nDialogCounter )
- );
-
- // and clear the reminder date
- removeReminder();
- }
- }
- }
-
- //====================================================================
- //= RegOptions
- //====================================================================
- //--------------------------------------------------------------------
- RegOptions::RegOptions()
- :m_pImpl( NULL )
- {
- }
-
- //--------------------------------------------------------------------
- void RegOptions::ensureImpl( )
- {
- if ( !m_pImpl )
- m_pImpl = RegOptionsImpl::registerClient();
- }
-
- //--------------------------------------------------------------------
- RegOptions::~RegOptions()
- {
- if ( m_pImpl )
- {
- RegOptionsImpl::revokeClient();
- m_pImpl = NULL;
- }
- }
-
- //--------------------------------------------------------------------
- String RegOptions::getRegistrationURL( ) const
- {
- const_cast< RegOptions* >( this )->ensureImpl( );
- return m_pImpl->getRegistrationURL();
- }
-
- //--------------------------------------------------------------------
- RegOptions::DialogPermission RegOptions::getDialogPermission( ) const
- {
- const_cast< RegOptions* >( this )->ensureImpl( );
- return m_pImpl->getDialogPermission();
- }
-
- //--------------------------------------------------------------------
- void RegOptions::markSessionDone( )
- {
- const_cast< RegOptions* >( this )->ensureImpl( );
- m_pImpl->markSessionDone();
- }
-
- //--------------------------------------------------------------------
- void RegOptions::activateReminder( sal_Int32 _nDaysFromNow )
- {
- const_cast< RegOptions* >( this )->ensureImpl( );
- m_pImpl->activateReminder( _nDaysFromNow );
- }
-//........................................................................
-} // namespace utl
-//........................................................................
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index cbce263..a979058 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -343,10 +343,6 @@ LwpCharacterBorderOverride::Override(LwpCharacterBorderOverride*)
LwpDLList::LwpDLList(LwpDLList*, LwpDLList*)
LwpDocData::SkipAtomHandler(LwpSvStream*)
LwpDocData::SkipExtra(LwpSvStream*)
-LwpDocument::GetMaxNumberOfPages()
-LwpDocument::ParseMasterDoc(IXFStream*)
-LwpFootnote::FindFootnoteTable()
-LwpFribTable::Parse(IXFStream*)
MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short)
MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
@@ -1017,7 +1013,6 @@ SfxULongRanges::SfxULongRanges(int, int, int, ...)
SfxULongRanges::SfxULongRanges(unsigned long const*)
SfxULongRanges::SfxULongRanges(unsigned long, unsigned long)
SfxULongRangesItem::SfxULongRangesItem(unsigned short, unsigned int const*)
-SfxURLToolBoxControl_Impl::LinkStubWindowEventListener(void*, void*)
SfxUShortRanges::Contains(unsigned short) const
SfxUShortRanges::Intersects(SfxUShortRanges const&) const
SfxUShortRanges::SfxUShortRanges(int, int, int, ...)
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index aca31df..07f75f5 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -297,7 +297,6 @@ public:
static sal_Bool IsProcessedMouseOrKeyEvent( sal_uLong nEventId );
static sal_uLong PostUserEvent( const Link& rLink, void* pCaller = NULL );
- static sal_Bool PostUserEvent( sal_uLong& rEventId, sal_uLong nEvent, void* pEventData = NULL );
static sal_Bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL );
static void RemoveUserEvent( sal_uLong nUserEvent );
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 9af5f08..df0625c 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1030,28 +1030,6 @@ sal_uLong Application::PostUserEvent( const Link& rLink, void* pCaller )
// -----------------------------------------------------------------------
-sal_Bool Application::PostUserEvent( sal_uLong& rEventId, sal_uLong nEvent, void* pEventData )
-{
- ImplSVEvent* pSVEvent = new ImplSVEvent;
- pSVEvent->mnEvent = nEvent;
- pSVEvent->mpData = pEventData;
- pSVEvent->mpLink = NULL;
- pSVEvent->mpWindow = NULL;
- pSVEvent->mbCall = sal_True;
- rEventId = (sal_uLong)pSVEvent;
- Window* pDefWindow = ImplGetDefaultWindow();
- if ( pDefWindow && pDefWindow->ImplGetFrame()->PostEvent( pSVEvent ) )
- return sal_True;
- else
- {
- rEventId = 0;
- delete pSVEvent;
- return sal_False;
- }
-}
-
-// -----------------------------------------------------------------------
-
sal_Bool Application::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller )
{
ImplSVEvent* pSVEvent = new ImplSVEvent;
commit b3c8e4177d24a184ffa854958fb177200608f68c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 21 23:49:54 2011 +0100
gsl_getSystemTextEncoding->osl_getThreadTextEncoding
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index f6f0ee4..9fc514a 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2468,7 +2468,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const
"\015\012";
#endif
- rtl_TextEncoding nEncode = gsl_getSystemTextEncoding();
+ rtl_TextEncoding nEncode = osl_getThreadTextEncoding();
for( sal_uInt16 n = 0; n < nSelCnt; ++n )
{
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index ccb45e4..6e7019c 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -264,9 +264,9 @@ ByteString HelpParser::makeAbsolutePath( const ByteString& sHelpFile , const Byt
String sFullEntry = aEntry.GetFull();
aEntry += DirEntry( String( "..", RTL_TEXTENCODING_ASCII_US ));
aEntry += DirEntry( rRoot_in );
- ByteString sPrjEntry( aEntry.GetFull(), gsl_getSystemTextEncoding());
+ ByteString sPrjEntry( aEntry.GetFull(), osl_getThreadTextEncoding());
ByteString sActFileName(
- sFullEntry.Copy( sPrjEntry.Len() + 1 ), gsl_getSystemTextEncoding());
+ sFullEntry.Copy( sPrjEntry.Len() + 1 ), osl_getThreadTextEncoding());
sActFileName.SearchAndReplaceAll( "/", "\\" );
return sActFileName;
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 7af3293..a9296e3 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -120,9 +120,9 @@ sal_Bool LngParser::CreateSDF(
String sFullEntry = aEntry.GetFull();
aEntry += DirEntry( String( "..", RTL_TEXTENCODING_ASCII_US ));
aEntry += DirEntry( rRoot );
- ByteString sPrjEntry( aEntry.GetFull(), gsl_getSystemTextEncoding());
+ ByteString sPrjEntry( aEntry.GetFull(), osl_getThreadTextEncoding());
ByteString sActFileName(
- sFullEntry.Copy( sPrjEntry.Len() + 1 ), gsl_getSystemTextEncoding());
+ sFullEntry.Copy( sPrjEntry.Len() + 1 ), osl_getThreadTextEncoding());
sActFileName.SearchAndReplaceAll( "/", "\\" );
size_t nPos = 0;
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index d30d081..c8a8d34 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -699,7 +699,7 @@ int _cdecl main( int argc, char *argv[] )
DirEntry aEntry( String( sFileName , RTL_TEXTENCODING_ASCII_US ));
aEntry.ToAbs();
String sFullEntry = aEntry.GetFull();
- ByteString sFileABS( aEntry.GetFull(), gsl_getSystemTextEncoding());
+ ByteString sFileABS(aEntry.GetFull(), osl_getThreadTextEncoding());
//printf("B %s\nA %s\n",rDestinationFile.GetBuffer(), sFile.GetBuffer());
sFileName = sFileABS;
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 012c340..b7eecdc 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -315,7 +315,7 @@ public:
{ return (nFlags & NOSYSRESTEST_FLAG) ? sal_False : sal_True; }
sal_Bool IsSrsDefault() const
{ return (nFlags & SRSDEFAULT_FLAG) ? sal_True : sal_False; }
- ByteString ChangeLanguage( const ByteString& rNewLang );
+ rtl::OString ChangeLanguage(const rtl::OString & rNewLang);
const std::vector< sal_uInt32 >& GetFallbacks() const
{ return aLangFallbacks; }
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 1c7e544..3368c1f 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -130,9 +130,9 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont,
return nRet;
}
-ByteString RscTypCont::ChangeLanguage( const ByteString& rNewLang )
+rtl::OString RscTypCont::ChangeLanguage(const rtl::OString& rNewLang)
{
- ByteString aRet = aLanguage;
+ rtl::OString aRet = aLanguage;
aLanguage = rNewLang;
rtl::OString aLang = aLanguage;
@@ -145,8 +145,8 @@ ByteString RscTypCont::ChangeLanguage( const ByteString& rNewLang )
aVariant = aLang.copy( nIndex );
bool bAppendEnUsFallback =
- ! (rNewLang.EqualsIgnoreCaseAscii( "en-US" ) ||
- rNewLang.EqualsIgnoreCaseAscii( "x-no-translate" ) );
+ ! (rNewLang.equalsIgnoreAsciiCase( "en-US" ) ||
+ rNewLang.equalsIgnoreAsciiCase( "x-no-translate" ) );
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "RscTypCont::ChangeLanguage:" );
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index 338fd0d..4b4f342 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -68,7 +68,7 @@ struct HtmlOptions_Impl
HtmlOptions_Impl() :
nFlags(HTMLCFG_LOCAL_GRF|HTMLCFG_IS_BASIC_WARNING),
nExportMode(HTML_CFG_NS40),
- eEncoding( gsl_getSystemTextEncoding() ),
+ eEncoding( osl_getThreadTextEncoding() ),
bIsEncodingDefault(sal_True)
{
aFontSizeArr[0] = HTMLFONTSZ1_DFLT;
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 9be060d..83f6244 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -249,7 +249,7 @@ ImplFontListNameInfo* FontList::ImplFindByName( const XubString& rStr ) const
void FontList::ImplInsertFonts( OutputDevice* pDevice, sal_Bool bAll,
sal_Bool bInsertData )
{
- rtl_TextEncoding eSystemEncoding = gsl_getSystemTextEncoding();
+ rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding();
sal_uInt16 nType;
if ( pDevice->GetOutDevType() != OUTDEV_PRINTER )
diff --git a/svtools/source/filter/sgvtext.cxx b/svtools/source/filter/sgvtext.cxx
index 3dbc61a..f303ebf 100644
--- a/svtools/source/filter/sgvtext.cxx
+++ b/svtools/source/filter/sgvtext.cxx
@@ -1208,7 +1208,7 @@ void SgfFontOne::ReadOne( const rtl::OString& rID, ByteString& Dsc )
else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("IBMPC"))) SVChSet=RTL_TEXTENCODING_IBM_850;
else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("MAC"))) SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYMBOL"))) SVChSet=RTL_TEXTENCODING_SYMBOL;
- else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYSTEM"))) SVChSet = gsl_getSystemTextEncoding();
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYSTEM"))) SVChSet = osl_getThreadTextEncoding();
else if (comphelper::string::isAsciiDecimalString(s) ) SVWidth=sal::static_int_cast< sal_uInt16 >(s.toInt32());
}
}
diff --git a/svtools/source/filter/wmf/winwmf.cxx b/svtools/source/filter/wmf/winwmf.cxx
index f970081..48c2222 100644
--- a/svtools/source/filter/wmf/winwmf.cxx
+++ b/svtools/source/filter/wmf/winwmf.cxx
@@ -759,11 +759,11 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
CharSet eCharSet;
if ( ( aLogFont.lfCharSet == OEM_CHARSET ) || ( aLogFont.lfCharSet == DEFAULT_CHARSET ) )
- eCharSet = gsl_getSystemTextEncoding();
+ eCharSet = osl_getThreadTextEncoding();
else
eCharSet = rtl_getTextEncodingFromWindowsCharset( aLogFont.lfCharSet );
if ( eCharSet == RTL_TEXTENCODING_DONTKNOW )
- eCharSet = gsl_getSystemTextEncoding();
+ eCharSet = osl_getThreadTextEncoding();
if ( eCharSet == RTL_TEXTENCODING_SYMBOL )
eCharSet = RTL_TEXTENCODING_MS_1252;
aLogFont.alfFaceName = UniString( lfFaceName, eCharSet );
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 39bb9f8..59d1085 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -98,7 +98,7 @@ sal_uInt16 IMapObject::GetVersion() const
void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const
{
IMapCompat* pCompat;
- const rtl_TextEncoding eEncoding = gsl_getSystemTextEncoding();
+ const rtl_TextEncoding eEncoding = osl_getThreadTextEncoding();
rOStm << GetType();
rOStm << GetVersion();
@@ -1121,7 +1121,7 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const
String aDummy;
sal_uInt16 nOldFormat = rOStm.GetNumberFormatInt();
sal_uInt16 nCount = (sal_uInt16) GetIMapObjectCount();
- const rtl_TextEncoding eEncoding = gsl_getSystemTextEncoding();
+ const rtl_TextEncoding eEncoding = osl_getThreadTextEncoding();
rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
@@ -1171,7 +1171,7 @@ void ImageMap::Read( SvStream& rIStm, const String& rBaseURL )
// Version ueberlesen wir
rIStm.SeekRel( 2 );
- rIStm.ReadByteString( aString ); aName = String( aString, gsl_getSystemTextEncoding() );
+ rIStm.ReadByteString( aString ); aName = String( aString, osl_getThreadTextEncoding() );
rIStm.ReadByteString( aString ); // Dummy
rIStm >> nCount;
rIStm.ReadByteString( aString ); // Dummy
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 359615a..b280931 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -73,12 +73,12 @@ void IMapObject::AppendNCSACoords(rtl::OStringBuffer& rBuf, const Point& rPoint1
void IMapObject::AppendCERNURL(rtl::OStringBuffer& rBuf, const String& rBaseURL) const
{
- rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), gsl_getSystemTextEncoding()));
+ rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding()));
}
void IMapObject::AppendNCSAURL(rtl::OStringBuffer& rBuf, const String& rBaseURL) const
{
- rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), gsl_getSystemTextEncoding()));
+ rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding()));
rBuf.append(' ');
}
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index cbb5eed..71763b9 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -98,8 +98,8 @@ SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc )
rIStm >> rObjDesc.maSize.Height();
rIStm >> rObjDesc.maDragStartPos.X();
rIStm >> rObjDesc.maDragStartPos.Y();
- rIStm.ReadByteString( rObjDesc.maTypeName, gsl_getSystemTextEncoding() );
- rIStm.ReadByteString( rObjDesc.maDisplayName, gsl_getSystemTextEncoding() );
+ rIStm.ReadByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() );
+ rIStm.ReadByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() );
rIStm >> nSig1 >> nSig2;
rObjDesc.mnViewAspect = static_cast< sal_uInt16 >( nViewAspect );
@@ -128,8 +128,8 @@ SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjD
rOStm << rObjDesc.maSize.Height();
rOStm << rObjDesc.maDragStartPos.X();
rOStm << rObjDesc.maDragStartPos.Y();
- rOStm.WriteByteString( rObjDesc.maTypeName, gsl_getSystemTextEncoding() );
- rOStm.WriteByteString( rObjDesc.maDisplayName, gsl_getSystemTextEncoding() );
+ rOStm.WriteByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() );
+ rOStm.WriteByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() );
rOStm << nSig1 << nSig2;
const sal_uInt32 nLastPos = rOStm.Tell();
@@ -781,7 +781,7 @@ sal_Bool TransferableHelper::SetString( const ::rtl::OUString& rString, const Da
TransferableDataHelper::IsEqual( aFileFlavor, rFlavor ) )
{
const String aString( rString );
- const ByteString aByteStr( aString, gsl_getSystemTextEncoding() );
+ const ByteString aByteStr( aString, osl_getThreadTextEncoding() );
Sequence< sal_Int8 > aSeq( aByteStr.Len() + 1 );
rtl_copyMemory( aSeq.getArray(), aByteStr.GetBuffer(), aByteStr.Len() );
@@ -874,7 +874,7 @@ sal_Bool TransferableHelper::SetTransferableObjectDescriptor( const Transferable
sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
{
- rtl_TextEncoding eSysCSet = gsl_getSystemTextEncoding();
+ rtl_TextEncoding eSysCSet = osl_getThreadTextEncoding();
switch( SotExchange::GetFormat( rFlavor ) )
{
@@ -1709,7 +1709,7 @@ sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, ::rtl::OU
while( nLen && ( 0 == *( pChars + nLen - 1 ) ) )
--nLen;
- rStr = ::rtl::OUString( pChars, nLen, gsl_getSystemTextEncoding() );
+ rStr = ::rtl::OUString( pChars, nLen, osl_getThreadTextEncoding() );
bRet = sal_True;
}
}
@@ -1981,8 +1981,8 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
if( GetSequence( rFlavor, aSeq ) && ( 2048 == aSeq.getLength() ) )
{
- rBmk = INetBookmark( String( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ), gsl_getSystemTextEncoding() ),
- String( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ) + 1024, gsl_getSystemTextEncoding() ) );
+ rBmk = INetBookmark( String( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ), osl_getThreadTextEncoding() ),
+ String( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ) + 1024, osl_getThreadTextEncoding() ) );
bRet = sal_True;
}
}
@@ -2000,7 +2000,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
if( pFDesc->cItems )
{
ByteString aDesc( pFDesc->fgd[ 0 ].cFileName );
- rtl_TextEncoding eTextEncoding = gsl_getSystemTextEncoding();
+ rtl_TextEncoding eTextEncoding = osl_getThreadTextEncoding();
if( ( aDesc.Len() > 4 ) && aDesc.Copy( aDesc.Len() - 4 ).EqualsIgnoreCaseAscii( ".URL" ) )
{
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index fc1eea6..fd669c9 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -55,7 +55,7 @@ const sal_Char HTMLOutFuncs::sNewLine[] = "\015\012";
HTMLOutContext::HTMLOutContext( rtl_TextEncoding eDestEnc )
{
m_eDestEnc = RTL_TEXTENCODING_DONTKNOW == eDestEnc
- ? gsl_getSystemTextEncoding()
+ ? osl_getThreadTextEncoding()
: eDestEnc;
m_hConv = rtl_createUnicodeToTextConverter( eDestEnc );
@@ -620,7 +620,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
String *pNonConvertableChars )
{
if( RTL_TEXTENCODING_DONTKNOW == eDestEnc )
- eDestEnc = gsl_getSystemTextEncoding();
+ eDestEnc = osl_getThreadTextEncoding();
const String& rOutName = rName.Len() ? rName : rIMap.GetName();
DBG_ASSERT( rOutName.Len(), "Kein ImageMap-Name" );
@@ -797,7 +797,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
String *pNonConvertableChars )
{
if( RTL_TEXTENCODING_DONTKNOW == eDestEnc )
- eDestEnc = gsl_getSystemTextEncoding();
+ eDestEnc = osl_getThreadTextEncoding();
// Script wird komplett nicht eingerueckt!
ByteString sOut( '<' );
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index 1994acd..4bfa012 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.cxx
@@ -105,7 +105,7 @@ sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat )
int iExtraHTML_Offset; // Extra HTML (stored in CImageElement)
sal_Char pImageURL[1]; // Append all variable-length strings starting here
*/
- rtl_TextEncoding eSysCSet = gsl_getSystemTextEncoding();
+ rtl_TextEncoding eSysCSet = osl_getThreadTextEncoding();
sal_Int32 nVal, nAnchorOffset, nAltOffset, nFilePos;
ByteString sData;
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 19a76c9..7fdf3b5 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -368,7 +368,7 @@ sal_uInt16 ImplGetComponentType( const String& rServiceName )
ComponentInfo aSearch;
- ByteString aServiceName( rServiceName, gsl_getSystemTextEncoding() );
+ ByteString aServiceName( rServiceName, osl_getThreadTextEncoding() );
aServiceName.ToLowerAscii();
if ( aServiceName.Len() )
aSearch.pName = aServiceName.GetBuffer();
diff --git a/tools/bootstrp/cppdep.cxx b/tools/bootstrp/cppdep.cxx
index a5a64fd..9829cee 100644
--- a/tools/bootstrp/cppdep.cxx
+++ b/tools/bootstrp/cppdep.cxx
@@ -98,7 +98,7 @@ sal_Bool CppDep::Search( ByteString aFileName )
SvFileStream aFile;
ByteString aReadLine;
- UniString suFileName( aFileName, gsl_getSystemTextEncoding());
+ UniString suFileName(aFileName, osl_getThreadTextEncoding());
aFile.Open( suFileName, STREAM_READ );
while ( aFile.ReadLine( aReadLine ))
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
index d1e26f2..b6ec4ec 100644
--- a/tools/bootstrp/rscdep.cxx
+++ b/tools/bootstrp/rscdep.cxx
@@ -111,7 +111,7 @@ int main( int argc, char** argv )
if ( aBuf[0] == '-' && aBuf[1] == 'f' && aBuf[2] == 'p' && aBuf[3] == '=' )
{
strcpy(pSrsFileName, &aBuf[4]);
- String aName( pSrsFileName, gsl_getSystemTextEncoding());
+ String aName( pSrsFileName, osl_getThreadTextEncoding());
DirEntry aDest( aName );
aSrsBaseName = aDest.GetBase();
}
@@ -126,7 +126,7 @@ int main( int argc, char** argv )
if (aBuf[0] == '@' )
{
rtl::OString aToken;
- String aRespName( &aBuf[1], gsl_getSystemTextEncoding());
+ String aRespName( &aBuf[1], osl_getThreadTextEncoding());
SimpleConfig aConfig( aRespName );
while ((aToken = aConfig.getNext()).getLength())
{
@@ -143,7 +143,7 @@ int main( int argc, char** argv )
if ( aBuf2[0] == '-' && aBuf2[1] == 'f' && aBuf2[2] == 'p' )
{
strcpy(pSrsFileName, &aBuf2[3]);
- String aName( pSrsFileName, gsl_getSystemTextEncoding());
+ String aName( pSrsFileName, osl_getThreadTextEncoding());
DirEntry aDest( aName );
aSrsBaseName = aDest.GetBase();
}
@@ -205,18 +205,18 @@ int main( int argc, char** argv )
}
- String aCwd(pFileNamePrefix, gsl_getSystemTextEncoding());
+ String aCwd(pFileNamePrefix, osl_getThreadTextEncoding());
SvFileStream aOutStream;
- String aOutputFileName( pOutputFileName, gsl_getSystemTextEncoding());
+ String aOutputFileName( pOutputFileName, osl_getThreadTextEncoding());
DirEntry aOutEntry( aOutputFileName );
String aOutPath = aOutEntry.GetPath().GetFull();
String aFileName( aOutPath );
aFileName += aDelim;
aFileName += aCwd;
- aFileName += String(".", gsl_getSystemTextEncoding());
+ aFileName += String(".", osl_getThreadTextEncoding());
aFileName += aSrsBaseName;
- aFileName += String(".dprr", gsl_getSystemTextEncoding());
+ aFileName += String(".dprr", osl_getThreadTextEncoding());
aOutStream.Open( aFileName, STREAM_WRITE );
ByteString aString;
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index fd4bf8f..64d2319 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -905,19 +905,13 @@ sal_Bool DirEntry::First()
String aUniPathName( GetPath().GetFull() );
#ifndef BOOTSTRAP
FSysRedirector::DoRedirect( aUniPathName );
- rtl::OString aPathName(rtl::OUStringToOString(aUniPathName, osl_getThreadTextEncoding()));
-#else
- rtl::OString aPathName(rtl::OUStringToOString(aUniPathName, gsl_getSystemTextEncoding()));
#endif
+ rtl::OString aPathName(rtl::OUStringToOString(aUniPathName, osl_getThreadTextEncoding()));
DIR *pDir = opendir(aPathName.getStr());
if ( pDir )
{
-#ifndef BOOTSTRAP
WildCard aWildeKarte( String(CMP_LOWER( aName ), osl_getThreadTextEncoding()) );
-#else
- WildCard aWildeKarte( String(CMP_LOWER( aName ), gsl_getSystemTextEncoding()) );
-#endif
for ( dirent* pEntry = readdir( pDir );
pEntry;
pEntry = readdir( pDir ) )
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index d6b67fe..24e5642 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -116,7 +116,7 @@ void INetMessage::SetHeaderField_Impl (
{
INetMIMEStringOutputSink aSink (0, STRING_MAXLEN);
INetMIME::writeHeaderFieldBody (
- aSink, eType, rValue, gsl_getSystemTextEncoding(), false);
+ aSink, eType, rValue, osl_getThreadTextEncoding(), false);
SetHeaderField_Impl (
INetMessageHeader (rName, aSink.takeBuffer()), rnIndex);
}
diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx
index 5ccaf41..c9dae13 100644
--- a/tools/source/stream/strmwnt.cxx
+++ b/tools/source/stream/strmwnt.cxx
@@ -397,10 +397,8 @@ void SvFileStream::Open( const String& rFilename, StreamMode nMode )
// !!! DirEntry aDirEntry( rFilename );
// !!! aFilename = aDirEntry.GetFull();
aFilename = aParsedFilename;
-#ifdef BOOTSTRAP
- ByteString aFileNameA( aFilename, gsl_getSystemTextEncoding());
-#else
ByteString aFileNameA( aFilename, osl_getThreadTextEncoding());
+#ifndef BOOTSTRAP
FSysRedirector::DoRedirect( aFilename );
#endif
SetLastError( ERROR_SUCCESS ); // ggf. durch Redirector geaendert!
diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index f5382b2..4233828 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -192,7 +192,7 @@ LanguageType SvtSysLocale::GetUILanguage() const
rtl_TextEncoding SvtSysLocale::GetBestMimeEncoding()
{
const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding(
- gsl_getSystemTextEncoding() );
+ osl_getThreadTextEncoding() );
if ( !pCharSet )
{
// If the system locale is unknown to us, e.g. LC_ALL=xx, match the UI
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 1683faf..eec8ba5 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -546,7 +546,7 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
void ImplStyleData::SetStandardStyles()
{
Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) );
- aStdFont.SetCharSet( gsl_getSystemTextEncoding() );
+ aStdFont.SetCharSet( osl_getThreadTextEncoding() );
aStdFont.SetWeight( WEIGHT_NORMAL );
aStdFont.SetName( utl::DefaultFontConfiguration::get().getUserInterfaceFont(com::sun::star::lang::Locale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), rtl::OUString(), rtl::OUString() ) ) );
maAppFont = aStdFont;
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 193c066..1190290 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -298,7 +298,7 @@ void ImplWriteFont( SvStream& rOStm, const Font& rFont,
rOStm << rFont.IsShadow();
rOStm << rFont.IsTransparent();
if ( rActualCharSet == RTL_TEXTENCODING_DONTKNOW )
- rActualCharSet = gsl_getSystemTextEncoding();
+ rActualCharSet = osl_getThreadTextEncoding();
}
// ------------------------------------------------------------------------
@@ -541,7 +541,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
LineInfo aLineInfo( LINE_NONE, 0 );
Stack aLIStack;
VirtualDevice aFontVDev;
- rtl_TextEncoding eActualCharSet = gsl_getSystemTextEncoding();
+ rtl_TextEncoding eActualCharSet = osl_getThreadTextEncoding();
sal_Bool bFatLine = sal_False;
// TODO: fix reindentation below if you can accept being blamed by the SCM
@@ -868,7 +868,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
eActualCharSet = aFont.GetCharSet();
if ( eActualCharSet == RTL_TEXTENCODING_DONTKNOW )
- eActualCharSet = gsl_getSystemTextEncoding();
+ eActualCharSet = osl_getThreadTextEncoding();
rMtf.AddAction( new MetaFontAction( aFont ) );
rMtf.AddAction( new MetaTextAlignAction( aFont.GetAlign() ) );
@@ -1384,7 +1384,7 @@ void SVMConverter::ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf )
sal_uLong nCountPos;
Font aSaveFont;
const sal_uInt16 nOldFormat = rOStm.GetNumberFormatInt();
- rtl_TextEncoding eActualCharSet = gsl_getSystemTextEncoding();
+ rtl_TextEncoding eActualCharSet = osl_getThreadTextEncoding();
const Size aPrefSize( rMtf.GetPrefSize() );
sal_Bool bRop_0_1 = sal_False;
VirtualDevice aSaveVDev;
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 32c4a58..99e56ec 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -3549,7 +3549,7 @@ void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
rOStm << maFont;
pData->meActualCharSet = maFont.GetCharSet();
if ( pData->meActualCharSet == RTL_TEXTENCODING_DONTKNOW )
- pData->meActualCharSet = gsl_getSystemTextEncoding();
+ pData->meActualCharSet = osl_getThreadTextEncoding();
}
// ------------------------------------------------------------------------
@@ -3560,7 +3560,7 @@ void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
rIStm >> maFont;
pData->meActualCharSet = maFont.GetCharSet();
if ( pData->meActualCharSet == RTL_TEXTENCODING_DONTKNOW )
- pData->meActualCharSet = gsl_getSystemTextEncoding();
+ pData->meActualCharSet = osl_getThreadTextEncoding();
}
// ========================================================================
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index aa0c77f..722bcbe 100755
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -581,7 +581,7 @@ Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang,
aFont.SetLanguage( eLang );
if ( aFont.GetCharSet() == RTL_TEXTENCODING_DONTKNOW )
- aFont.SetCharSet( gsl_getSystemTextEncoding() );
+ aFont.SetCharSet( osl_getThreadTextEncoding() );
// Should we only return available fonts on the given device
if ( pOutDev )
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index 9b2283a..d0cf39f 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -614,7 +614,7 @@ StatusDrawCallback (XIC ic, XPointer client_data, XIMStatusDrawCallbackStruct *c
}
}
if( nLength )
- aText = String( pMBString, nLength, gsl_getSystemTextEncoding() );
+ aText = String( pMBString, nLength, osl_getThreadTextEncoding() );
}
::vcl::I18NStatus::get().setStatusText( aText );
}
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index e48ea3d..51321b8 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -272,7 +272,7 @@ void SalAbort( const XubString& rErrorText )
if( !rErrorText.Len() )
std::fprintf( stderr, "Application Error\n" );
else
- std::fprintf( stderr, "%s\n", rtl::OUStringToOString(rErrorText, gsl_getSystemTextEncoding()).getStr() );
+ std::fprintf( stderr, "%s\n", rtl::OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() );
exit(-1);
}
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index d04ef42..0cd00db 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -233,7 +233,7 @@ bool PrinterInfoManager::checkPrintersChanged( bool bWait )
void PrinterInfoManager::initialize()
{
m_bUseIncludeFeature = false;
- rtl_TextEncoding aEncoding = gsl_getSystemTextEncoding();
+ rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
m_aPrinters.clear();
m_aWatchFiles.clear();
OUString aDefaultPrinter;
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index c8bcf74..9da00b9 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -839,7 +839,7 @@ SvXMLImportContext *SdXMLImport::CreateFontDeclsContext(const OUString& rLocalNa
XMLFontStylesContext *pFSContext =
new XMLFontStylesContext( *this, XML_NAMESPACE_OFFICE,
rLocalName, xAttrList,
- gsl_getSystemTextEncoding() );
+ osl_getThreadTextEncoding() );
SetFontDecls( pFSContext );
return pFSContext;
}
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index dcd8c9f..64598e6 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -255,7 +255,7 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck(
if( !pFontCharSet )
{
- aAny <<= (sal_Int16)gsl_getSystemTextEncoding();
+ aAny <<= (sal_Int16)osl_getThreadTextEncoding();
#ifdef DBG_UTIL
sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId(
pFontFamilyName->mnIndex + 4 );
commit 16032347d9b43d1ccefc185713e43b4d19974de6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 21 23:08:39 2011 +0100
ByteString->rtl::OString
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index aef46ce..fd4bf8f 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -670,12 +670,12 @@ DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle )
return;
}
- ByteString aTmpName(rInitName, osl_getThreadTextEncoding());
+ ByteString aTmpName(rtl::OUStringToOString(rInitName, osl_getThreadTextEncoding()));
if( aTmpName.CompareIgnoreCaseToAscii("file:",5 ) == COMPARE_EQUAL )
{
#ifndef BOOTSTRAP
DBG_WARNING( "File URLs are not permitted but accepted" );
- aTmpName = ByteString(String(INetURLObject( rInitName ).PathToFileName()), osl_getThreadTextEncoding());
+ aTmpName = rtl::OUStringToOString(INetURLObject( rInitName ).PathToFileName(), osl_getThreadTextEncoding());
eStyle = FSYS_STYLE_HOST;
#endif // BOOTSTRAP
}
@@ -686,7 +686,7 @@ DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle )
if ( FileBase::getFileURLFromSystemPath( OUString( rInitName ), aTmp ) == FileBase::E_None )
{
aOInitName = OUString( rInitName );
- aTmpName = ByteString( String(aOInitName), osl_getThreadTextEncoding() );
+ aTmpName = rtl::OUStringToOString(aOInitName, osl_getThreadTextEncoding());
}
#ifdef DBG_UTIL
@@ -730,7 +730,7 @@ DirEntry::DirEntry( const ByteString& rInitName, FSysPathStyle eStyle )
{
#ifndef BOOTSTRAP
DBG_WARNING( "File URLs are not permitted but accepted" );
- aTmpName = ByteString(String(INetURLObject( rInitName ).PathToFileName()), osl_getThreadTextEncoding());
+ aTmpName = rtl::OUStringToOString(INetURLObject( rInitName ).PathToFileName(), osl_getThreadTextEncoding());
eStyle = FSYS_STYLE_HOST;
#endif
}
@@ -905,12 +905,12 @@ sal_Bool DirEntry::First()
String aUniPathName( GetPath().GetFull() );
#ifndef BOOTSTRAP
FSysRedirector::DoRedirect( aUniPathName );
- ByteString aPathName(aUniPathName, osl_getThreadTextEncoding());
+ rtl::OString aPathName(rtl::OUStringToOString(aUniPathName, osl_getThreadTextEncoding()));
#else
- ByteString aPathName(aUniPathName, gsl_getSystemTextEncoding());
+ rtl::OString aPathName(rtl::OUStringToOString(aUniPathName, gsl_getSystemTextEncoding()));
#endif
- DIR *pDir = opendir( (char*) aPathName.GetBuffer() );
+ DIR *pDir = opendir(aPathName.getStr());
if ( pDir )
{
#ifndef BOOTSTRAP
@@ -966,7 +966,7 @@ String DirEntry::GetFull( FSysPathStyle eStyle, sal_Bool bWithDelimiter,
}
else
{
- aRet = ByteString(GetName( eStyle ), osl_getThreadTextEncoding());
+ aRet = rtl::OUStringToOString(GetName(eStyle), osl_getThreadTextEncoding());
}
//! Hack
@@ -1388,9 +1388,9 @@ void DirEntry::SetName( const String& rName, FSysPathStyle eFormatter )
eFlag = FSYS_FLAG_INVALID;
}
else
- {
- aName = ByteString(rName, osl_getThreadTextEncoding());
- }
+ {
+ aName = rtl::OUStringToOString(rName, osl_getThreadTextEncoding());
+ }
}
/*************************************************************************
@@ -1477,10 +1477,10 @@ void DirEntry::SetBase( const String& rBase, char cSep )
{
// es wurde ein cSep an der Position p1 gefunden
aName.Erase( 0, static_cast< xub_StrLen >(p1 - p0) );
- aName.Insert( ByteString(rBase, osl_getThreadTextEncoding()), 0 );
+ aName.Insert(ByteString(rBase, osl_getThreadTextEncoding()), 0 );
}
else
- aName = ByteString(rBase, osl_getThreadTextEncoding());
+ aName = rtl::OUStringToOString(rBase, osl_getThreadTextEncoding());
}
/*************************************************************************
@@ -1508,7 +1508,7 @@ const DirEntry& DirEntry::SetTempNameBase( const String &rBase )
DirEntry aTempDir = DirEntry().TempName().GetPath();
aTempDir += DirEntry( rBase );
#ifdef UNX
- ByteString aName( aTempDir.GetFull(), osl_getThreadTextEncoding());
+ ByteString aName(rtl::OUStringToOString(aTempDir.GetFull(), osl_getThreadTextEncoding()));
if ( access( aName.GetBuffer(), W_OK | X_OK | R_OK ) )
{
// Create the directory and only on success give all rights to
@@ -1557,7 +1557,7 @@ DirEntry DirEntry::TempName( DirEntryKind eKind ) const
if ( pWild )
{
if ( pParent )
- aDirName = ByteString(pParent->GetFull(), osl_getThreadTextEncoding());
+ aDirName = rtl::OUStringToOString(pParent->GetFull(), osl_getThreadTextEncoding());
strncpy( pfx, aName.GetBuffer(), Min( (int)5, (int)(pWild-aName.GetBuffer()) ) );
pfx[ pWild-aName.GetBuffer() ] = 0;
const char *pExt = strchr( pWild, '.' );
@@ -1571,7 +1571,7 @@ DirEntry DirEntry::TempName( DirEntryKind eKind ) const
}
else
{
- aDirName = ByteString(GetFull(), osl_getThreadTextEncoding());
+ aDirName = rtl::OUStringToOString(GetFull(), osl_getThreadTextEncoding());
strcpy( pfx, "lo" );
strcpy( ext, ".tmp" );
}
@@ -1651,7 +1651,7 @@ DirEntry DirEntry::TempName( DirEntryKind eKind ) const
#endif
if ( FSYS_KIND_DIR == eKind )
{
- if ( 0 == _mkdir( ByteString(aRedirected.GetBuffer(), osl_getThreadTextEncoding()).GetBuffer() ) )
+ if (0 == _mkdir(rtl::OUStringToOString(aRedirected, osl_getThreadTextEncoding()).getStr()))
{
aRet = DirEntry( aRetVal );
break;
@@ -1660,7 +1660,7 @@ DirEntry DirEntry::TempName( DirEntryKind eKind ) const
else
{
#if defined(UNX)
- if( access( ByteString(aRedirected, osl_getThreadTextEncoding()).GetBuffer(), F_OK ) )
+ if (access(rtl::OUStringToOString(aRedirected, osl_getThreadTextEncoding()).getStr(), F_OK))
{
aRet = DirEntry( aRetVal );
break;
@@ -1866,12 +1866,12 @@ sal_Bool DirEntry::MakeDir( sal_Bool bSloppy ) const
#ifndef BOOTSTRAP
FSysRedirector::DoRedirect( aDirName );
#endif
- ByteString bDirName( aDirName, osl_getThreadTextEncoding() );
+ rtl::OString bDirName(rtl::OUStringToOString(aDirName, osl_getThreadTextEncoding()));
#ifdef WIN32
SetLastError(0);
#endif
- sal_Bool bResult = (0 == _mkdir( (char*) bDirName.GetBuffer() ));
+ sal_Bool bResult = (0 == _mkdir(bDirName.getStr()));
if ( !bResult )
{
// Wer hat diese Methode const gemacht ?
@@ -1903,10 +1903,10 @@ FSysError DirEntry::CopyTo( const DirEntry& rDest, FSysAction nActions ) const
#ifdef UNX
{
// Hardlink anlegen
- HACK(redirection missing)
- ByteString aThis(GetFull(), osl_getThreadTextEncoding());
- ByteString aDest(rDest.GetFull(), osl_getThreadTextEncoding());
- if (link( aThis.GetBuffer(), aDest.GetBuffer() ) == -1)
+ HACK(redirection missing)
+ rtl::OString aThis(rtl::OUStringToOString(GetFull(), osl_getThreadTextEncoding()));
+ rtl::OString aDest(rtl::OUStringToOString(rDest.GetFull(), osl_getThreadTextEncoding()));
+ if (link(aThis.getStr(), aDest.getStr()) == -1)
return Sys2SolarError_Impl( errno );
else
return FSYS_ERR_OK;
@@ -1961,8 +1961,8 @@ FSysError DirEntry::MoveTo( const DirEntry& rNewName ) const
FSysRedirector::DoRedirect(aTo);
#endif
- ByteString bFrom(aFrom, osl_getThreadTextEncoding());
- ByteString bTo(aTo, osl_getThreadTextEncoding());
+ ByteString bFrom(rtl::OUStringToOString(aFrom, osl_getThreadTextEncoding()));
+ ByteString bTo(rtl::OUStringToOString(aTo, osl_getThreadTextEncoding()));
#ifdef WNT
// MoveTo nun atomar
@@ -2095,7 +2095,7 @@ FSysError DirEntry::Kill( FSysAction nActions ) const
#ifndef BOOTSTRAP
FSysRedirector::DoRedirect( aTmpName );
#endif
- ByteString bTmpName( aTmpName, osl_getThreadTextEncoding());
+ ByteString bTmpName(rtl::OUStringToOString(aTmpName, osl_getThreadTextEncoding()));
char *pName = new char[bTmpName.Len()+2];
strcpy( pName, bTmpName.GetBuffer() );
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index afef764..bd315db 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -230,7 +230,7 @@ String DirEntry::GetVolume() const
aPath.ToAbs();
struct stat buf;
- while (stat (ByteString(aPath.GetFull(), osl_getThreadTextEncoding()).GetBuffer(), &buf))
+ while (stat(rtl::OUStringToOString(aPath.GetFull(), osl_getThreadTextEncoding()).getStr(), &buf))
{
if (aPath.Level() <= 1)
return String();
@@ -251,7 +251,7 @@ DirEntry DirEntry::GetDevice() const
aPath.ToAbs();
struct stat buf;
- while (stat (ByteString(aPath.GetFull(), osl_getThreadTextEncoding()).GetBuffer(), &buf))
+ while (stat(rtl::OUStringToOString(aPath.GetFull(), osl_getThreadTextEncoding()).getStr(), &buf))
{
if (aPath.Level() <= 1)
return String();
@@ -275,14 +275,14 @@ sal_Bool DirEntry::SetCWD( sal_Bool bSloppy ) const
DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
- ByteString aPath( GetFull(), osl_getThreadTextEncoding());
- if ( !chdir( aPath.GetBuffer() ) )
+ rtl::OString aPath(rtl::OUStringToOString(GetFull(), osl_getThreadTextEncoding()));
+ if (!chdir(aPath.getStr()))
{
return sal_True;
}
else
{
- if ( bSloppy && !chdir(aPath.GetBuffer()) )
+ if (bSloppy && !chdir(aPath.getStr()))
{
return sal_True;
}
@@ -306,7 +306,7 @@ sal_uInt16 DirReader_Impl::Read()
{
if (!pDosDir)
{
- pDosDir = opendir( (char*) ByteString(aPath, osl_getThreadTextEncoding()).GetBuffer() );
+ pDosDir = opendir(rtl::OUStringToOString(aPath, osl_getThreadTextEncoding()).getStr());
}
if (!pDosDir)
@@ -402,8 +402,8 @@ sal_Bool FileStat::Update( const DirEntry& rDirEntry, sal_Bool )
}
struct stat aStat;
- ByteString aPath( rDirEntry.GetFull(), osl_getThreadTextEncoding() );
- if ( stat( (char*) aPath.GetBuffer(), &aStat ) )
+ rtl::OString aPath(rtl::OUStringToOString(rDirEntry.GetFull(), osl_getThreadTextEncoding()));
+ if (stat(aPath.getStr(), &aStat))
{
// pl: #67851#
// do this here, because an existing filename containing "wildcards"
@@ -412,10 +412,10 @@ sal_Bool FileStat::Update( const DirEntry& rDirEntry, sal_Bool )
// are handled badly across the whole Office
// Sonderbehandlung falls es sich um eine Wildcard handelt
- ByteString aTempName( rDirEntry.GetName(), osl_getThreadTextEncoding() );
- if ( strchr( (char*) aTempName.GetBuffer(), '?' ) ||
- strchr( (char*) aTempName.GetBuffer(), '*' ) ||
- strchr( (char*) aTempName.GetBuffer(), ';' ) )
+ rtl::OString aTempName(rtl::OUStringToOString(rDirEntry.GetName(), osl_getThreadTextEncoding()));
+ if ( aTempName.indexOf('?') != -1 ||
+ aTempName.indexOf('*') != -1 ||
+ aTempName.indexOf(';') != -1 )
{
nKindFlags = FSYS_KIND_WILD;
nError = FSYS_ERR_OK;
@@ -506,7 +506,7 @@ void FileStat::SetDateTime( const String& rFileName,
struct utimbuf u_time;
u_time.actime = time;
u_time.modtime = time;
- utime (ByteString(rFileName, osl_getThreadTextEncoding()).GetBuffer(), &u_time);
+ utime(rtl::OUStringToOString(rFileName, osl_getThreadTextEncoding()).getStr(), &u_time);
}
}
commit 6ccc829c54a6a26442745e46e1d560994f5b0b45
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 21 22:56:45 2011 +0100
remove defines that don't do anything
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 632b4c1..2aae76d 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -147,15 +147,6 @@ enum FSysExact
};
// ------------
-// - Char-Set -
-// ------------
-
-// Was different for WIN, no longer needed...
-#define GUI2FSYS(s) s
-#define FSYS2GUI(s) s
-
-
-// ------------
// - FileStat -
// ------------
diff --git a/tools/source/fsys/comdep.hxx b/tools/source/fsys/comdep.hxx
index e528d3b..efa9e1a 100644
--- a/tools/source/fsys/comdep.hxx
+++ b/tools/source/fsys/comdep.hxx
@@ -72,7 +72,7 @@ struct DirReader_Impl
: pDir( &rDir ),
pDosEntry( 0 ),
pParent( 0 ),
- aPath( GUI2FSYS(rDir.GetFull()) ),
+ aPath(rDir.GetFull()),
bReady ( sal_False ),
bInUse( sal_False )
{
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 796d746..aef46ce 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -909,7 +909,6 @@ sal_Bool DirEntry::First()
#else
ByteString aPathName(aUniPathName, gsl_getSystemTextEncoding());
#endif
- aPathName = GUI2FSYS( aPathName );
DIR *pDir = opendir( (char*) aPathName.GetBuffer() );
if ( pDir )
@@ -923,7 +922,7 @@ sal_Bool DirEntry::First()
pEntry;
pEntry = readdir( pDir ) )
{
- ByteString aFound( FSYS2GUI( ByteString( pEntry->d_name ) ) );
+ ByteString aFound(pEntry->d_name);
if ( aWildeKarte.Matches( String(CMP_LOWER( aFound ), osl_getThreadTextEncoding())))
{
aName = aFound;
@@ -1868,7 +1867,6 @@ sal_Bool DirEntry::MakeDir( sal_Bool bSloppy ) const
FSysRedirector::DoRedirect( aDirName );
#endif
ByteString bDirName( aDirName, osl_getThreadTextEncoding() );
- bDirName = GUI2FSYS( bDirName );
#ifdef WIN32
SetLastError(0);
@@ -1906,8 +1904,8 @@ FSysError DirEntry::CopyTo( const DirEntry& rDest, FSysAction nActions ) const
{
// Hardlink anlegen
HACK(redirection missing)
- ByteString aThis(GUI2FSYS(GetFull()), osl_getThreadTextEncoding());
- ByteString aDest(GUI2FSYS(rDest.GetFull()), osl_getThreadTextEncoding());
+ ByteString aThis(GetFull(), osl_getThreadTextEncoding());
+ ByteString aDest(rDest.GetFull(), osl_getThreadTextEncoding());
if (link( aThis.GetBuffer(), aDest.GetBuffer() ) == -1)
return Sys2SolarError_Impl( errno );
else
@@ -1965,8 +1963,6 @@ FSysError DirEntry::MoveTo( const DirEntry& rNewName ) const
ByteString bFrom(aFrom, osl_getThreadTextEncoding());
ByteString bTo(aTo, osl_getThreadTextEncoding());
- bFrom = GUI2FSYS(bFrom);
- bTo = GUI2FSYS(bTo);
#ifdef WNT
// MoveTo nun atomar
@@ -2100,7 +2096,6 @@ FSysError DirEntry::Kill( FSysAction nActions ) const
FSysRedirector::DoRedirect( aTmpName );
#endif
ByteString bTmpName( aTmpName, osl_getThreadTextEncoding());
- bTmpName = GUI2FSYS(bTmpName);
char *pName = new char[bTmpName.Len()+2];
strcpy( pName, bTmpName.GetBuffer() );
commit f491382a868c3589bceece0ef34cf80d493f7c72
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 21 21:48:09 2011 +0100
remove else branches of if(1)
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index ef669db..0b0b7c4 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -529,22 +529,10 @@ void SfxDispatcher::Pop
if ( !pSfxApp->IsDowning() && pImp->aToDoStack.Count() )
{
- //! if (SFX_APP()->AnyInput(INPUT_KEYBOARD | INPUT_MOUSE) )
- //! AnyInput does not work, here a criterion has yet to found.
- //! As long as time after time with a timer.
- if (sal_True)
- {
- // No immediate update is requested
- pImp->aTimer.SetTimeout(SFX_FLUSH_TIMEOUT);
- pImp->aTimer.SetTimeoutHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) );
- pImp->aTimer.Start();
- }
- else
- {
- // Upgrade as quickly as possible(should be the normal case)
- pImp->aTimer.Stop();
- GetpApp()->PostUserEvent(pImp->nEventId, (void*)0);
- }
+ // No immediate update is requested
+ pImp->aTimer.SetTimeout(SFX_FLUSH_TIMEOUT);
+ pImp->aTimer.SetTimeoutHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) );
+ pImp->aTimer.Start();
}
else
{
@@ -796,19 +784,10 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ )
if ( pImp->aToDoStack.Count() )
{
- if (sal_True)
- {
- // No immediate update is requested
- pImp->aTimer.SetTimeout(SFX_FLUSH_TIMEOUT);
- pImp->aTimer.SetTimeoutHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) );
- pImp->aTimer.Start();
- }
- else
- {
- // Upgrade as quickly as possible(should be the normal case)
- pImp->aTimer.Stop();
- GetpApp()->PostUserEvent(pImp->nEventId, (void*)0);
- }
+ // No immediate update is requested
+ pImp->aTimer.SetTimeout(SFX_FLUSH_TIMEOUT);
+ pImp->aTimer.SetTimeoutHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) );
+ pImp->aTimer.Start();
}
}
commit 53f4837b92560d75eb6e629bebaf4e523ee40162
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 21 21:24:35 2011 +0100
callcatcher: various methods
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index 415bf7a..2d238d1 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -164,8 +164,7 @@ protected:
sal_Bool ImplEncryptStream( SvStream& rStream ) const;
BasicLibInfo* FindLibInfo( StarBASIC* pBasic ) const;
void CheckModules( StarBASIC* pBasic, sal_Bool bReference ) const;
- BasicManager(); // This is used only to customize the paths for 'Save as'.
- ~BasicManager();
+ ~BasicManager();
public:
TYPEINFO();
@@ -214,7 +213,6 @@ public:
sal_Bool IsBasicModified() const;
sal_Bool HasErrors();
- void ClearErrors();
BasicError* GetFirstError();
BasicError* GetNextError();
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 14626f6..c3187f5 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -541,8 +541,6 @@ public:
String aBasicLibPath; // TODO: Should be member of manager, but currently not incompatible
BasicLibInfo* GetObject( size_t i );
BasicLibInfo* First();
- BasicLibInfo* Last();
- BasicLibInfo* Prev();
BasicLibInfo* Next();
size_t GetPos( BasicLibInfo* LibInfo );
size_t Count() const { return aList.size(); };
@@ -575,24 +573,6 @@ BasicLibInfo* BasicLibs::First()
return aList[ CurrentLib ];
}
-BasicLibInfo* BasicLibs::Last()
-{
- if ( aList.empty() )
- return NULL;
- CurrentLib = aList.size() - 1;
- return aList[ CurrentLib ];
-}
-
-BasicLibInfo* BasicLibs::Prev()
-{
- if ( aList.empty()
- || CurrentLib == 0
- )
- return NULL;
- --CurrentLib;
- return aList[ CurrentLib ];
-}
-
BasicLibInfo* BasicLibs::Next()
{
if ( aList.empty()
@@ -914,14 +894,6 @@ BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath, sal_Bool bDocMgr
bBasMgrModified = sal_False;
}
-BasicManager::BasicManager()
-{
- DBG_CTOR( BasicManager, 0 );
- // This ctor may only be used to adapt relative paths for 'Save As'.
- // There is no AppBasic so libs must not be loaded...
- Init();
-}
-
void BasicManager::ImpMgrNotLoaded( const String& rStorageName )
{
// pErrInf is only destroyed if the error os processed by an
@@ -1745,12 +1717,6 @@ sal_Bool BasicManager::HasErrors()
return pErrorMgr->HasErrors();
}
-void BasicManager::ClearErrors()
-{
- DBG_CHKTHIS( BasicManager, 0 );
- pErrorMgr->Reset();
-}
-
BasicError* BasicManager::GetFirstError()
{
DBG_CHKTHIS( BasicManager, 0 );
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 828c073..cc08afd 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -1382,7 +1382,7 @@ bool SvtLinguConfig::HasGrammarChecker() const
uno::Sequence< rtl::OUString > aElementNames( xNA->getElementNames() );
bRes = aElementNames.getLength() > 0;
}
- catch (uno::Exception &)
+ catch (const uno::Exception&)
{
}
diff --git a/unusedcode.easy b/unusedcode.easy
index 6a599aa..cbce263 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,11 +1,6 @@
(anonymous namespace)::getState(std::vector<cppcanvas::internal::OutDevState, std::allocator<cppcanvas::internal::OutDevState> > const&)
(anonymous namespace)::writeInfo(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, rtl::OUString const&, rtl::OUString const&)
-Application::PostUserEvent(unsigned long, void*)
BasicIDEDLL::~BasicIDEDLL()
-BasicLibs::Last()
-BasicLibs::Prev()
-BasicManager::BasicManager()
-BasicManager::ClearErrors()
BitSet::BitSet(Range const&)
BitSet::BitSet(unsigned short*, unsigned short)
BitmapEx::Draw(OutputDevice*, Point const&, Size const&, Point const&, Size const&) const
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 2c85dbb..aca31df 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -296,7 +296,6 @@ public:
static void RemoveMouseAndKeyEvents( Window *pWin );
static sal_Bool IsProcessedMouseOrKeyEvent( sal_uLong nEventId );
- static sal_uLong PostUserEvent( sal_uLong nEvent, void* pEventData = NULL );
static sal_uLong PostUserEvent( const Link& rLink, void* pCaller = NULL );
static sal_Bool PostUserEvent( sal_uLong& rEventId, sal_uLong nEvent, void* pEventData = NULL );
static sal_Bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL );
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 925ad70..9af5f08 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1021,17 +1021,6 @@ sal_Bool Application::IsProcessedMouseOrKeyEvent( sal_uLong nEventId )
return sal_True;
}
-// -----------------------------------------------------------------------
-
-sal_uLong Application::PostUserEvent( sal_uLong nEvent, void* pEventData )
-{
- sal_uLong nEventId;
- PostUserEvent( nEventId, nEvent, pEventData );
- return nEventId;
-}
-
-// -----------------------------------------------------------------------
-
sal_uLong Application::PostUserEvent( const Link& rLink, void* pCaller )
{
sal_uLong nEventId;
commit 8df44286192df6cabd84a370a785ea67f3c0b806
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 21 21:22:54 2011 +0100
apparently can enable this warning
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d82c121..a9a5764 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -78,10 +78,9 @@ gb_CXXFLAGS := \
-Wall \
-Wendif-labels \
-Wextra \
- -Wno-ctor-dtor-privacy \
- -Wno-non-virtual-dtor \
- -Woverloaded-virtual \
-Wshadow \
+ -Woverloaded-virtual \
+ -Wno-non-virtual-dtor \
-fPIC \
-fmessage-length=0 \
-fno-common \
commit 91a418d2137e33b48d9e524b53dd71e08754a06b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 21 01:09:00 2011 +0100
ByteString->rtl::OString
diff --git a/automation/source/testtool/tcommuni.cxx b/automation/source/testtool/tcommuni.cxx
index 32b9707..82583a4 100644
--- a/automation/source/testtool/tcommuni.cxx
+++ b/automation/source/testtool/tcommuni.cxx
@@ -117,13 +117,12 @@ sal_Bool CommunicationManagerClientViaSocketTT::KillApplication()
#define GETSET(aVar, KeyName, Dafault) \
aVar = aConf.ReadKey(KeyName,"No Entry"); \
- if ( aVar.CompareTo("No Entry") == COMPARE_EQUAL ) \
+ if (aVar.equalsL(RTL_CONSTASCII_STRINGPARAM("No Entry"))) \
{ \
- aVar = ByteString(Dafault); \
+ aVar = Dafault; \
aConf.WriteKey(KeyName, aVar); \
}
-
String GetHostConfig()
{
String aHostToTalk;
@@ -138,12 +137,12 @@ String GetHostConfig()
return Application::GetCommandLineParam( i ).Copy(6);
}
- ByteString abHostToTalk;
+ rtl::OString abHostToTalk;
Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
aConf.SetGroup("Communication");
GETSET( abHostToTalk, "Host", DEFAULT_HOST );
- return UniString( abHostToTalk, RTL_TEXTENCODING_UTF8 );
+ return rtl::OStringToOUString(abHostToTalk, RTL_TEXTENCODING_UTF8);
}
@@ -164,13 +163,13 @@ sal_uLong GetTTPortConfig()
}
}
- ByteString abPortToTalk;
+ rtl::OString abPortToTalk;
Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
aConf.SetGroup("Communication");
GETSET( abPortToTalk, "TTPort",
rtl::OString::valueOf(static_cast<sal_Int32>(TESTTOOL_DEFAULT_PORT)) );
- return (sal_uLong)abPortToTalk.ToInt32();
+ return (sal_uLong)abPortToTalk.toInt32();
}
@@ -191,13 +190,13 @@ sal_uLong GetUnoPortConfig()
}
}
- ByteString abPortToTalk;
+ rtl::OString abPortToTalk;
Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
aConf.SetGroup("Communication");
GETSET( abPortToTalk, "UnoPort",
rtl::OString::valueOf(static_cast<sal_Int32>(UNO_DEFAULT_PORT)) );
- return (sal_uLong)abPortToTalk.ToInt32();
+ return (sal_uLong)abPortToTalk.toInt32();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index 77e1e09..1009619 100644
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -515,12 +515,10 @@ CrashreportOptions::CrashreportOptions( Window* pParent, Config &aConfig )
aNFCRPort.SetUseThousandSep( sal_False );
- ByteString aTemp;
-
aConfig.SetGroup("Crashreporter");
- aTemp = aConfig.ReadKey( "UseProxy", "false" );
- if ( aTemp.EqualsIgnoreCaseAscii( "true" ) || aTemp.Equals( "1" ) )
+ rtl::OString aTemp = aConfig.ReadKey( "UseProxy", "false" );
+ if ( aTemp.equalsIgnoreAsciiCase("true") || aTemp.equals("1") )
aCBUseProxy.Check();
else
aCBUseProxy.Check( sal_False );
@@ -529,13 +527,13 @@ CrashreportOptions::CrashreportOptions( Window* pParent, Config &aConfig )
LINK( this, CrashreportOptions, CheckProxy ).Call( NULL ); // call once to initialize
aTemp = aConfig.ReadKey( "ProxyServer" );
- aEDCRHost.SetText( String( aTemp, RTL_TEXTENCODING_UTF8 ) );
+ aEDCRHost.SetText(rtl::OStringToOUString(aTemp, RTL_TEXTENCODING_UTF8));
aTemp = aConfig.ReadKey( "ProxyPort", "8080" );
- aNFCRPort.SetValue( aTemp.ToInt32() );
+ aNFCRPort.SetValue(aTemp.toInt32());
aTemp = aConfig.ReadKey( "AllowContact", "false" );
- if ( aTemp.EqualsIgnoreCaseAscii( "true" ) || aTemp.Equals( "1" ) )
+ if ( aTemp.equalsIgnoreAsciiCase("true") || aTemp.equals("1") )
aCBAllowContact.Check();
else
aCBAllowContact.Check( sal_False );
@@ -544,7 +542,7 @@ CrashreportOptions::CrashreportOptions( Window* pParent, Config &aConfig )
LINK( this, CrashreportOptions, CheckResponse ).Call( NULL ); // call once to initialize
aTemp = aConfig.ReadKey( "ReturnAddress" );
- aEDEMail.SetText( String( aTemp, RTL_TEXTENCODING_UTF8 ) );
+ aEDEMail.SetText(rtl::OStringToOUString(aTemp, RTL_TEXTENCODING_UTF8));
}
@@ -659,8 +657,8 @@ void MiscOptions::Save( Config &aConfig )
rtl::OString::valueOf(static_cast<sal_Int32>(aServerTimeout.GetTime().GetTime())));
aConfig.SetGroup("LRU");
- ByteString aTemp = aConfig.ReadKey( "MaxLRU", "4" );
- sal_uInt16 nOldMaxLRU = (sal_uInt16)aTemp.ToInt32();
+ rtl::OString aTemp = aConfig.ReadKey( "MaxLRU", "4" );
+ sal_uInt16 nOldMaxLRU = (sal_uInt16)aTemp.toInt32();
sal_uInt16 n;
for ( n = nOldMaxLRU ; n > aTFMaxLRU.GetValue() ; n-- )
{
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index a83af73..39b8862 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -40,6 +40,7 @@
#include <math.h>
#include <sal/macros.h>
#include <rtl/strbuf.hxx>
+#include <comphelper/string.hxx>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list