[Libreoffice-commits] .: 10 commits - sc/inc sc/source svx/source sw/inc sw/source tools/inc tools/source unusedcode.easy vcl/aqua vcl/headless vcl/inc vcl/ios vcl/source vcl/unx vcl/win
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Feb 20 13:20:38 PST 2012
sc/inc/chgtrack.hxx | 1
sc/inc/document.hxx | 1
sc/source/core/data/documen3.cxx | 17 -----
sc/source/core/tool/chgtrack.cxx | 6 --
sc/source/filter/starcalc/collect.cxx | 26 ---------
sc/source/filter/starcalc/collect.hxx | 4 -
svx/source/engine3d/scene3d.cxx | 4 -
sw/inc/swabstdlg.hxx | 9 +--
sw/inc/swunodef.hxx | 39 -------------
sw/inc/toxwrap.hxx | 19 +++---
sw/source/core/bastyp/calc.cxx | 5 -
sw/source/core/inc/dbg_lay.hxx | 6 --
sw/source/core/inc/toxhlp.hxx | 21 +++----
sw/source/core/layout/dbg_lay.cxx | 51 -----------------
sw/source/core/tox/toxhlp.cxx | 28 ++++-----
sw/source/core/unocore/swunohelper.cxx | 61 ++++++++++-----------
sw/source/filter/ww8/ww8graf.cxx | 1
sw/source/filter/ww8/ww8par.cxx | 3 -
sw/source/ui/app/docsh2.cxx | 3 -
sw/source/ui/dbui/dbtree.cxx | 2
sw/source/ui/dialog/regionsw.cxx | 1
sw/source/ui/dialog/swdlgfact.cxx | 8 +-
sw/source/ui/dialog/swdlgfact.hxx | 8 +-
sw/source/ui/dialog/uiregionsw.cxx | 5 -
sw/source/ui/dochdl/swdtflvr.cxx | 1
sw/source/ui/docvw/romenu.cxx | 3 -
sw/source/ui/envelp/label1.cxx | 4 -
sw/source/ui/inc/dbtree.hxx | 1
sw/source/ui/inc/swrenamexnameddlg.hxx | 17 ++---
sw/source/ui/inc/uivwimp.hxx | 17 ++---
sw/source/ui/inc/unotools.hxx | 9 +--
sw/source/ui/uiview/uivwimp.cxx | 2
sw/source/ui/uno/unoatxt.cxx | 1
tools/inc/tools/fsys.hxx | 1
tools/source/fsys/dirent.cxx | 25 --------
unusedcode.easy | 12 ----
vcl/aqua/source/window/salframe.cxx | 5 -
vcl/headless/svpframe.cxx | 5 -
vcl/inc/aqua/salframe.h | 1
vcl/inc/headless/svpframe.hxx | 1
vcl/inc/ios/salframe.h | 1
vcl/inc/salframe.hxx | 2
vcl/inc/unx/gtk/gtkframe.hxx | 2
vcl/inc/unx/salbmp.h | 7 --
vcl/inc/unx/salframe.h | 1
vcl/inc/vcl/field.hxx | 6 --
vcl/inc/vcl/outdev.hxx | 2
vcl/inc/vcl/window.hxx | 2
vcl/inc/win/salframe.h | 1
vcl/ios/source/window/salframe.cxx | 5 -
vcl/source/control/field.cxx | 40 --------------
vcl/source/gdi/outdev2.cxx | 13 ----
vcl/source/window/window2.cxx | 36 ------------
vcl/unx/generic/app/saldisp.cxx | 5 -
vcl/unx/generic/gdi/salbmp.cxx | 94 ---------------------------------
vcl/unx/generic/window/salframe.cxx | 48 ----------------
vcl/unx/gtk/window/gtkframe.cxx | 26 ---------
vcl/win/source/window/salframe.cxx | 33 -----------
58 files changed, 108 insertions(+), 650 deletions(-)
New commits:
commit ced95abf531d83dfddd7ab5b30b20b044a9ba1f9
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 20 21:05:03 2012 +0100
vcl: simplify logic
Thanks to Cor Nouws
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 5269065..d6060d5 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -277,10 +277,7 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
}
else if( pVInfos[i].c_class == PseudoColor )
{
- if( pVInfos[i].depth <= 8 )
- bUsable = sal_True;
- else if( pVInfos[i].depth == 12 )
- bUsable = sal_True;
+ bUsable = sal_True;
}
pWeight[ i ] = bUsable ? nTrueColor*pVInfos[i].depth : -1024;
pWeight[ i ] -= pVInfos[ i ].visualid;
commit e656e2cb0bcf9281b52fac7692b541d5a0f9dde6
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 20 20:51:08 2012 +0100
remove now unused swunodef.hxx
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 1824413..22d780f 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -43,7 +43,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/container/XNamed.hpp>
-#include "swunodef.hxx"
#include "itabenum.hxx"
class SfxViewFrame;
diff --git a/sw/inc/swunodef.hxx b/sw/inc/swunodef.hxx
deleted file mode 100644
index 3ef1d5c..0000000
--- a/sw/inc/swunodef.hxx
+++ /dev/null
@@ -1,35 +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 _SWUNODEF_HXX
-#define _SWUNODEF_HXX
-
-#define STAR_REFERENCE(aType) ::com::sun::star::uno::Reference< ::com::sun::star::aType >
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx
index f0f1b1d..dd60ac7 100644
--- a/sw/inc/toxwrap.hxx
+++ b/sw/inc/toxwrap.hxx
@@ -32,7 +32,6 @@
#include <tools/solar.h>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <swunodef.hxx>
#include "swdllapi.h"
namespace com { namespace sun { namespace star {
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 09d8a09..dc5e7c4 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -58,7 +58,6 @@
#include <usrfld.hxx>
#include <dbmgr.hxx>
#include <docfld.hxx>
-#include <swunodef.hxx>
#include <swtypes.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/inc/toxhlp.hxx b/sw/source/core/inc/toxhlp.hxx
index 887c3c6..04c7991 100644
--- a/sw/source/core/inc/toxhlp.hxx
+++ b/sw/source/core/inc/toxhlp.hxx
@@ -32,7 +32,6 @@
#include <tools/solar.h>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <swunodef.hxx>
namespace com { namespace sun { namespace star {
namespace i18n {
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index fbe2480..fd40f9c 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -45,7 +45,6 @@
#include <ucbhelper/content.hxx>
#include <svl/svstdarr.hxx>
#include <swunohelper.hxx>
-#include <swunodef.hxx>
namespace SWUnoHelper {
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 0e66f64..22d773a 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -81,7 +81,6 @@
#include <docsh.hxx>
#include <mdiexp.hxx> // Progress
#include <fmtcnct.hxx>
-#include <swunodef.hxx>
#include "ww8struc.hxx"
#include "ww8scan.hxx"
#include "ww8par.hxx" // class SwWWImplReader
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 20cfe71..a50a8ff 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -99,7 +99,6 @@
#include <mdiexp.hxx> // Progress
#include <statstr.hrc> // ResId fuer Statusleiste
#include <swerror.h> // ERR_WW8_...
-#include <swunodef.hxx>
#include <unodraw.hxx>
#include <swtable.hxx> // class SwTableLines, ...
// #i18732#
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 6a12af5..707899b 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -69,7 +69,6 @@
#include <basic/basmgr.hxx>
#include <sot/storage.hxx>
#include <sot/clsids.hxx>
-#include <swunodef.hxx>
#include <fmtcol.hxx>
#include <swevent.hxx>
#include <view.hxx> // for the current view
diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx
index c133ec1..10cf9f4 100644
--- a/sw/source/ui/dialog/regionsw.cxx
+++ b/sw/source/ui/dialog/regionsw.cxx
@@ -54,7 +54,6 @@
#include <swundo.hxx> // for Undo-Ids
#include <column.hxx>
#include <fmtfsize.hxx>
-#include <swunodef.hxx>
#include <shellio.hxx>
#include <helpid.h>
#include <cmdid.h>
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 66a68a8..93b7166 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -62,7 +62,6 @@
#include <swundo.hxx> // for Undo-Ids
#include <column.hxx>
#include <fmtfsize.hxx>
-#include <swunodef.hxx>
#include <shellio.hxx>
#include <helpid.h>
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 190f3cd..b7be519 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -109,7 +109,6 @@
#include <ndole.hxx>
#include <swwait.hxx>
#include <viewopt.hxx>
-#include <swunodef.hxx>
#include <vcl/sound.hxx>
#include <swerror.h>
#include <SwCapObjType.hxx>
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index 96b4a8f..c6ac398 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -47,7 +47,6 @@
#include <editeng/brshitem.hxx>
-#include <swunodef.hxx>
#include <frmatr.hxx>
#include <fmturl.hxx>
#include <fmtinfmt.hxx>
diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx
index f3eb86e..5c5e7ee 100644
--- a/sw/source/ui/inc/dbtree.hxx
+++ b/sw/source/ui/inc/dbtree.hxx
@@ -36,7 +36,6 @@ namespace com{namespace sun{namespace star{namespace container{
}}}}
#include "swdllapi.h"
#include <swtypes.hxx>
-#include <swunodef.hxx>
class SwDBTreeList_Impl;
class SwWrtShell;
diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx
index 33c5e22..f17ba03 100644
--- a/sw/source/ui/inc/swrenamexnameddlg.hxx
+++ b/sw/source/ui/inc/swrenamexnameddlg.hxx
@@ -39,7 +39,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/container/XNamed.hpp>
-#include <swunodef.hxx>
class SwRenameXNamedDlg : public ModalDialog
{
diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx
index d0c6781..4351b82 100644
--- a/sw/source/ui/inc/uivwimp.hxx
+++ b/sw/source/ui/inc/uivwimp.hxx
@@ -35,7 +35,6 @@
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <swunodef.hxx>
#include <cppuhelper/weakref.hxx>
class SwXTextView;
diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx
index a47151b..9733caf 100644
--- a/sw/source/ui/inc/unotools.hxx
+++ b/sw/source/ui/inc/unotools.hxx
@@ -40,7 +40,6 @@
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <tools/resary.hxx>
-#include <swunodef.hxx>
#include "swdllapi.h"
class SwOneExampleFrame;
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 8914d1d..0b5844c 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -53,7 +53,6 @@
#include <IMark.hxx>
#include <unoprnms.hxx>
#include <docsh.hxx>
-#include <swunodef.hxx>
#include <swmodule.hxx>
#include <svl/smplhint.hxx>
#include <svl/macitem.hxx>
commit 9a6332f4e44452959f4e85062d58733c18a121ee
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 20 20:45:25 2012 +0100
expand and remove macro STAR_REFERENCE
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 2c6045c..1824413 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -306,8 +306,8 @@ class AbstractSwRenameXNamedDlg : public VclAbstractDialog //add for SwRenameXNa
public:
virtual void SetForbiddenChars( const String& rSet ) = 0;
virtual void SetAlternativeAccess(
- STAR_REFERENCE( container::XNameAccess ) & xSecond,
- STAR_REFERENCE( container::XNameAccess ) & xThird ) = 0;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird ) = 0;
};
class AbstractSwModalRedlineAcceptDlg : public VclAbstractDialog //add for SwModalRedlineAcceptDlg
@@ -416,8 +416,8 @@ public:
virtual AbstractSwFldDlg * CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId ) = 0; //add for SwFldDlg
virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0; //add for SwFldEditDlg
virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg( Window* pParent, //add for SwRenameXNamedDlg
- STAR_REFERENCE( container::XNamed ) & xNamed,
- STAR_REFERENCE( container::XNameAccess ) & xNameAccess, int nResId ) = 0;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess, int nResId ) = 0;
virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg ( Window *pParent, int nResId ) = 0; //add for SwModalRedlineAcceptDlg
virtual VclAbstractDialog* CreateSwVclDialog( int nResId, Window* pParent, sal_Bool& rWithPrev ) = 0; //add for SwMergeTblDlg
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 5f26634..09d8a09 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -269,7 +269,7 @@ SwCalc::SwCalc( SwDoc& rD )
eLang != SvxLocaleToLanguage( pCharClass->getLocale() ) )
{
::com::sun::star::lang::Locale aLocale( SvxCreateLocale( eLang ));
- STAR_REFERENCE( lang::XMultiServiceFactory ) xMSF(
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF(
::comphelper::getProcessServiceFactory() );
pCharClass = new CharClass( xMSF, aLocale );
pLclData = new LocaleDataWrapper( xMSF, aLocale );
diff --git a/sw/source/core/inc/toxhlp.hxx b/sw/source/core/inc/toxhlp.hxx
index 62db2c9..887c3c6 100644
--- a/sw/source/core/inc/toxhlp.hxx
+++ b/sw/source/core/inc/toxhlp.hxx
@@ -54,7 +54,7 @@ class IndexEntrySupplierWrapper
public:
IndexEntrySupplierWrapper(
const ::com::sun::star::lang::Locale& rLcl,
- STAR_REFERENCE( lang::XMultiServiceFactory )& rxMSF );
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMSF );
~IndexEntrySupplierWrapper();
String GetIndexKey( const String& rTxt, const String& rTxtReading,
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index e1d24e3..c27faef 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -45,7 +45,7 @@ IndexEntrySupplierWrapper::IndexEntrySupplierWrapper()
::comphelper::getProcessServiceFactory();
try {
- STAR_REFERENCE( uno::XInterface ) xI =
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xI =
rxMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.i18n.IndexEntrySupplier")) );
if( xI.is() )
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 35c1002..fbe2480 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -72,7 +72,7 @@ sal_Bool UCB_DeleteFile( const String& rURL )
try
{
ucbhelper::Content aTempContent( rURL,
- STAR_REFERENCE( ucb::XCommandEnvironment )());
+ ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >());
aTempContent.executeCommand(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
@@ -97,7 +97,7 @@ sal_Bool UCB_CopyFile( const String& rURL, const String& rNewURL, sal_Bool bCopy
String sMainURL( aURL.GetMainURL(INetURLObject::NO_DECODE) );
ucbhelper::Content aTempContent( sMainURL,
- STAR_REFERENCE( ucb::XCommandEnvironment )());
+ ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >());
::com::sun::star::uno::Any aAny;
::com::sun::star::ucb::TransferInfo aInfo;
@@ -123,21 +123,21 @@ sal_Bool UCB_IsCaseSensitiveFileName( const String& rURL )
sal_Bool bCaseSensitive;
try
{
- STAR_REFERENCE( lang::XMultiServiceFactory ) xMSF =
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF =
comphelper::getProcessServiceFactory();
INetURLObject aTempObj( rURL );
aTempObj.SetBase( aTempObj.GetBase().toAsciiLowerCase() );
- STAR_REFERENCE( ucb::XContentIdentifier ) xRef1 = new
+ ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > xRef1 = new
ucbhelper::ContentIdentifier( xMSF,
aTempObj.GetMainURL( INetURLObject::NO_DECODE ));
aTempObj.SetBase(aTempObj.GetBase().toAsciiUpperCase());
- STAR_REFERENCE( ucb::XContentIdentifier ) xRef2 = new
+ ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > xRef2 = new
ucbhelper::ContentIdentifier( xMSF,
aTempObj.GetMainURL( INetURLObject::NO_DECODE ));
- STAR_REFERENCE( ucb::XContentProvider ) xProv =
+ ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider > xProv =
ucbhelper::ContentBroker::get()->getContentProviderInterface();
sal_Int32 nCompare = xProv->compareContentIds( xRef1, xRef2 );
@@ -156,7 +156,7 @@ sal_Bool UCB_IsReadOnlyFileName( const String& rURL )
sal_Bool bIsReadOnly = sal_False;
try
{
- ucbhelper::Content aCnt( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )());
+ ucbhelper::Content aCnt( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >());
::com::sun::star::uno::Any aAny = aCnt.getPropertyValue(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsReadOnly")));
if(aAny.hasValue())
@@ -174,7 +174,7 @@ sal_Bool UCB_IsFile( const String& rURL )
sal_Bool bExists = sal_False;
try
{
- ::ucbhelper::Content aContent( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )() );
+ ::ucbhelper::Content aContent( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
bExists = aContent.isDocument();
}
catch (::com::sun::star::uno::Exception &)
@@ -188,7 +188,7 @@ sal_Bool UCB_IsDirectory( const String& rURL )
sal_Bool bExists = sal_False;
try
{
- ::ucbhelper::Content aContent( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )() );
+ ::ucbhelper::Content aContent( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
bExists = aContent.isFolder();
}
catch (::com::sun::star::uno::Exception &)
@@ -210,8 +210,8 @@ sal_Bool UCB_GetFileListOfFolder( const String& rURL,
sal_Bool bOk = sal_False;
try
{
- ucbhelper::Content aCnt( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )());
- STAR_REFERENCE( sdbc::XResultSet ) xResultSet;
+ ucbhelper::Content aCnt( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >());
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet;
sal_uInt16 nSeqSize = pDateTimeList ? 2 : 1;
::com::sun::star::uno::Sequence < rtl::OUString > aProps( nSeqSize );
@@ -231,7 +231,7 @@ sal_Bool UCB_GetFileListOfFolder( const String& rURL,
if( xResultSet.is() )
{
- STAR_REFERENCE( sdbc::XRow ) xRow( xResultSet, ::com::sun::star::uno::UNO_QUERY );
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > xRow( xResultSet, ::com::sun::star::uno::UNO_QUERY );
xub_StrLen nExtLen = pExtension ? pExtension->Len() : 0;
try
{
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index ad88e98..20cfe71 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -366,7 +366,7 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId,
SvStorageRef xSrc = xSrcStg->OpenSotStorage( sStorageName,
STREAM_READWRITE| STREAM_SHARE_DENYALL );
OSL_ENSURE(rReader.pFormImpl, "No Form Implementation!");
- STAR_REFERENCE( drawing::XShape ) xShape;
+ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape;
if ( (!(rReader.bIsHeader || rReader.bIsFooter)) &&
rReader.pFormImpl->ReadOCXStream(xSrc,&xShape,true))
{
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 5064712..6a12af5 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -1115,7 +1115,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
{
TransferDataContainer* pClipCntnr =
new TransferDataContainer;
- STAR_REFERENCE( datatransfer::XTransferable )
+ ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >
xRef( pClipCntnr );
pClipCntnr->CopyAnyData( FORMAT_RTF, (sal_Char*)
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index a79a752..6070f90 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -489,7 +489,7 @@ void SwDBTreeList::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ )
if( sDBName.Len() )
{
TransferDataContainer* pContainer = new TransferDataContainer;
- STAR_REFERENCE( datatransfer::XTransferable ) xRef( pContainer );
+ ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRef( pContainer );
if( sColumnName.Len() )
{
// drag database field
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 71430bc..ca2698b 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -372,8 +372,8 @@ void AbstractSwRenameXNamedDlg_Impl::SetForbiddenChars( const String& rSet )
}
void AbstractSwRenameXNamedDlg_Impl::SetAlternativeAccess(
- STAR_REFERENCE( container::XNameAccess ) & xSecond,
- STAR_REFERENCE( container::XNameAccess ) & xThird )
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird )
{
pDlg->SetAlternativeAccess( xSecond, xThird);
}
@@ -1114,8 +1114,8 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView&
}
AbstractSwRenameXNamedDlg * SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg( Window* pParent,
- STAR_REFERENCE( container::XNamed ) & xNamed,
- STAR_REFERENCE( container::XNameAccess ) & xNameAccess,int nResId )
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess,int nResId )
{
SwRenameXNamedDlg* pDlg=NULL;
switch ( nResId )
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 66ee0ab..9484900 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -242,8 +242,8 @@ class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg
DECL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl,SwRenameXNamedDlg )
virtual void SetForbiddenChars( const String& rSet );
virtual void SetAlternativeAccess(
- STAR_REFERENCE( container::XNameAccess ) & xSecond,
- STAR_REFERENCE( container::XNameAccess ) & xThird );
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird );
};
//add for SwRenameXNamedDlg end
//add for SwModalRedlineAcceptDlg begin
@@ -493,8 +493,8 @@ public:
virtual AbstractSwFldDlg * CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId ); //add for SwFldDlg
virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ); //add for SwFldEditDlg
virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg( Window* pParent, //add for SwRenameXNamedDlg
- STAR_REFERENCE( container::XNamed ) & xNamed,
- STAR_REFERENCE( container::XNameAccess ) & xNameAccess, int nResId );
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess, int nResId );
virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg ( Window *pParent, int nResId ); //add for SwModalRedlineAcceptDlg
virtual VclAbstractDialog* CreateSwVclDialog( int nResId,
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index dada27d..96b4a8f 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -378,7 +378,7 @@ void SwReadOnlyPopup::Execute( Window* pWin, sal_uInt16 nId )
if( pClipCntnr )
{
- STAR_REFERENCE( datatransfer::XTransferable ) xRef( pClipCntnr );
+ ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRef( pClipCntnr );
if( pClipCntnr->HasAnyData() )
pClipCntnr->CopyToClipboard( pWin );
}
diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx
index 1f21305..33c5e22 100644
--- a/sw/source/ui/inc/swrenamexnameddlg.hxx
+++ b/sw/source/ui/inc/swrenamexnameddlg.hxx
@@ -52,25 +52,25 @@ class SwRenameXNamedDlg : public ModalDialog
String sRemoveWarning;
- STAR_REFERENCE( container::XNamed ) & xNamed;
- STAR_REFERENCE( container::XNameAccess ) & xNameAccess;
- STAR_REFERENCE( container::XNameAccess ) xSecondAccess;
- STAR_REFERENCE( container::XNameAccess ) xThirdAccess;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xSecondAccess;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xThirdAccess;
DECL_LINK(OkHdl, OKButton*);
DECL_LINK(ModifyHdl, NoSpaceEdit*);
public:
SwRenameXNamedDlg( Window* pParent,
- STAR_REFERENCE( container::XNamed ) & xNamed,
- STAR_REFERENCE( container::XNameAccess ) & xNameAccess );
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess );
void SetForbiddenChars( const String& rSet )
{ aNewNameED.SetForbiddenChars( rSet ); }
void SetAlternativeAccess(
- STAR_REFERENCE( container::XNameAccess ) & xSecond,
- STAR_REFERENCE( container::XNameAccess ) & xThird )
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird )
{
xSecondAccess = xSecond;
xThirdAccess = xThird;
diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx
index d65053f..d0c6781 100644
--- a/sw/source/ui/inc/uivwimp.hxx
+++ b/sw/source/ui/inc/uivwimp.hxx
@@ -97,10 +97,10 @@ class SwMailMergeConfigItem;
class SwView_Impl
{
- STAR_REFERENCE( lang::XEventListener ) xScanEvtLstnr;
- STAR_REFERENCE( lang::XEventListener ) xClipEvtLstnr;
- STAR_REFERENCE( frame::XDispatchProviderInterceptor ) xDisProvInterceptor;
- STAR_REFERENCE( view::XSelectionSupplier ) *pxXTextView; // UNO object
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > xScanEvtLstnr;
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > xClipEvtLstnr;
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor > xDisProvInterceptor;
+ ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier > *pxXTextView; // UNO object
com::sun::star::uno::WeakReference< com::sun::star::lang::XUnoTunnel > xTransferable;
// temporary document for printing text of selection / multi selection
diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx
index aa710f1..a47151b 100644
--- a/sw/source/ui/inc/unotools.hxx
+++ b/sw/source/ui/inc/unotools.hxx
@@ -110,10 +110,10 @@ public:
String* pURL = 0);
~SwOneExampleFrame();
- STAR_REFERENCE( awt::XControl ) & GetControl() {return _xControl; }
- STAR_REFERENCE( frame::XModel ) & GetModel() {return _xModel;}
- STAR_REFERENCE( frame::XController ) & GetController() {return _xController;}
- STAR_REFERENCE( text::XTextCursor ) & GetTextCursor() {return _xCursor;}
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > & GetControl() {return _xControl; }
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & GetModel() {return _xModel;}
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > & GetController() {return _xController;}
+ ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > & GetTextCursor() {return _xCursor;}
void ClearDocument( sal_Bool bStartTimer = sal_False );
commit 0235bb8ea237daec5f85e241ad5677a649363571
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 20 17:35:32 2012 +0100
expand and remove macro CLIP_NMSPC
diff --git a/sw/inc/swunodef.hxx b/sw/inc/swunodef.hxx
index 01942f5..3ef1d5c 100644
--- a/sw/inc/swunodef.hxx
+++ b/sw/inc/swunodef.hxx
@@ -28,8 +28,6 @@
#ifndef _SWUNODEF_HXX
#define _SWUNODEF_HXX
-#define CLIP_NMSPC ::com::sun::star::datatransfer::clipboard
-
#define STAR_REFERENCE(aType) ::com::sun::star::uno::Reference< ::com::sun::star::aType >
#endif
diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx
index cf712f8..d65053f 100644
--- a/sw/source/ui/inc/uivwimp.hxx
+++ b/sw/source/ui/inc/uivwimp.hxx
@@ -72,7 +72,7 @@ public:
// --------------------------- Clipboard EventListener ------------------
class SwClipboardChangeListener : public ::cppu::WeakImplHelper1<
- CLIP_NMSPC::XClipboardListener >
+ ::com::sun::star::datatransfer::clipboard::XClipboardListener >
{
SwView* pView;
@@ -81,7 +81,7 @@ class SwClipboardChangeListener : public ::cppu::WeakImplHelper1<
throw ( com::sun::star::uno::RuntimeException );
// XClipboardListener
- virtual void SAL_CALL changedContents( const CLIP_NMSPC::ClipboardEvent& rEventObject )
+ virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& rEventObject )
throw ( com::sun::star::uno::RuntimeException );
public:
diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx
index e8787b2..a9b6b08 100644
--- a/sw/source/ui/uiview/uivwimp.cxx
+++ b/sw/source/ui/uiview/uivwimp.cxx
@@ -281,7 +281,7 @@ void SAL_CALL SwClipboardChangeListener::disposing( const EventObject& /*rEventO
{
}
-void SAL_CALL SwClipboardChangeListener::changedContents( const CLIP_NMSPC::ClipboardEvent& rEventObject )
+void SAL_CALL SwClipboardChangeListener::changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& rEventObject )
throw ( RuntimeException )
{
commit 2bc792f2bb22740a365f13b0007af99073f1667a
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 20 17:32:53 2012 +0100
expand and remove macro UNO_NMSPC
diff --git a/sw/inc/swunodef.hxx b/sw/inc/swunodef.hxx
index 6029f8f..01942f5 100644
--- a/sw/inc/swunodef.hxx
+++ b/sw/inc/swunodef.hxx
@@ -28,10 +28,9 @@
#ifndef _SWUNODEF_HXX
#define _SWUNODEF_HXX
-#define UNO_NMSPC ::com::sun::star::uno
#define CLIP_NMSPC ::com::sun::star::datatransfer::clipboard
-#define STAR_REFERENCE(aType) UNO_NMSPC::Reference< ::com::sun::star::aType >
+#define STAR_REFERENCE(aType) ::com::sun::star::uno::Reference< ::com::sun::star::aType >
#endif
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index dc952ed..e1d24e3 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -50,12 +50,12 @@ IndexEntrySupplierWrapper::IndexEntrySupplierWrapper()
"com.sun.star.i18n.IndexEntrySupplier")) );
if( xI.is() )
{
- UNO_NMSPC::Any x = xI->queryInterface( ::getCppuType(
+ ::com::sun::star::uno::Any x = xI->queryInterface( ::getCppuType(
(const uno::Reference< i18n::XExtendedIndexEntrySupplier>*)0) );
x >>= xIES;
}
}
- catch (const UNO_NMSPC::Exception&
+ catch (const ::com::sun::star::uno::Exception&
#if OSL_DEBUG_LEVEL > 0
e
#endif
@@ -81,7 +81,7 @@ String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt,
try {
sRet = xIES->getIndexKey( rTxt, rTxtReading, rLocale );
}
- catch (const UNO_NMSPC::Exception&
+ catch (const ::com::sun::star::uno::Exception&
#if OSL_DEBUG_LEVEL > 0
e
#endif
@@ -102,7 +102,7 @@ String IndexEntrySupplierWrapper::GetFollowingText( sal_Bool bMorePages ) const
try {
sRet = xIES->getIndexFollowPageWord( bMorePages, aLcl );
}
- catch (const UNO_NMSPC::Exception&
+ catch (const ::com::sun::star::uno::Exception&
#if OSL_DEBUG_LEVEL > 0
e
#endif
@@ -125,7 +125,7 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Local
try {
sRet = xIES->getAlgorithmList( rLcl );
}
- catch (const UNO_NMSPC::Exception&
+ catch (const ::com::sun::star::uno::Exception&
#if OSL_DEBUG_LEVEL > 0
e
#endif
@@ -148,7 +148,7 @@ sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
try {
bRet = xIES->loadAlgorithm( rLcl, sSortAlgorithm, nOptions );
}
- catch (const UNO_NMSPC::Exception&
+ catch (const ::com::sun::star::uno::Exception&
#if OSL_DEBUG_LEVEL > 0
e
#endif
@@ -174,7 +174,7 @@ sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
nRet = xIES->compareIndexEntry( rTxt1, rTxtReading1, rLocale1,
rTxt2, rTxtReading2, rLocale2 );
}
- catch (const UNO_NMSPC::Exception&
+ catch (const ::com::sun::star::uno::Exception&
#if OSL_DEBUG_LEVEL > 0
e
#endif
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 87d24e1..35c1002 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -49,14 +49,14 @@
namespace SWUnoHelper {
-sal_Int32 GetEnumAsInt32( const UNO_NMSPC::Any& rVal )
+sal_Int32 GetEnumAsInt32( const ::com::sun::star::uno::Any& rVal )
{
sal_Int32 eVal;
try
{
eVal = comphelper::getEnumAsINT32( rVal );
}
- catch( UNO_NMSPC::Exception & )
+ catch( ::com::sun::star::uno::Exception & )
{
eVal = 0;
OSL_FAIL( "can't get EnumAsInt32" );
@@ -75,10 +75,10 @@ sal_Bool UCB_DeleteFile( const String& rURL )
STAR_REFERENCE( ucb::XCommandEnvironment )());
aTempContent.executeCommand(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
- UNO_NMSPC::makeAny( sal_Bool( sal_True ) ) );
+ ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
bRemoved = sal_True;
}
- catch( UNO_NMSPC::Exception& )
+ catch( ::com::sun::star::uno::Exception& )
{
bRemoved = sal_False;
OSL_FAIL( "Exeception from executeCommand( delete )" );
@@ -99,7 +99,7 @@ sal_Bool UCB_CopyFile( const String& rURL, const String& rNewURL, sal_Bool bCopy
ucbhelper::Content aTempContent( sMainURL,
STAR_REFERENCE( ucb::XCommandEnvironment )());
- UNO_NMSPC::Any aAny;
+ ::com::sun::star::uno::Any aAny;
::com::sun::star::ucb::TransferInfo aInfo;
aInfo.NameClash = ::com::sun::star::ucb::NameClash::ERROR;
aInfo.NewTitle = sName;
@@ -110,7 +110,7 @@ sal_Bool UCB_CopyFile( const String& rURL, const String& rNewURL, sal_Bool bCopy
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")),
aAny );
}
- catch( UNO_NMSPC::Exception& )
+ catch( ::com::sun::star::uno::Exception& )
{
OSL_FAIL( "Exeception from executeCommand( transfer )" );
bCopyCompleted = sal_False;
@@ -143,7 +143,7 @@ sal_Bool UCB_IsCaseSensitiveFileName( const String& rURL )
sal_Int32 nCompare = xProv->compareContentIds( xRef1, xRef2 );
bCaseSensitive = 0 != nCompare;
}
- catch( UNO_NMSPC::Exception& )
+ catch( ::com::sun::star::uno::Exception& )
{
bCaseSensitive = sal_False;
OSL_FAIL( "Exeception from compareContentIds()" );
@@ -157,12 +157,12 @@ sal_Bool UCB_IsReadOnlyFileName( const String& rURL )
try
{
ucbhelper::Content aCnt( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )());
- UNO_NMSPC::Any aAny = aCnt.getPropertyValue(
+ ::com::sun::star::uno::Any aAny = aCnt.getPropertyValue(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsReadOnly")));
if(aAny.hasValue())
bIsReadOnly = *(sal_Bool*)aAny.getValue();
}
- catch( UNO_NMSPC::Exception& )
+ catch( ::com::sun::star::uno::Exception& )
{
bIsReadOnly = sal_False;
}
@@ -177,7 +177,7 @@ sal_Bool UCB_IsFile( const String& rURL )
::ucbhelper::Content aContent( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )() );
bExists = aContent.isDocument();
}
- catch (UNO_NMSPC::Exception &)
+ catch (::com::sun::star::uno::Exception &)
{
}
return bExists;
@@ -191,7 +191,7 @@ sal_Bool UCB_IsDirectory( const String& rURL )
::ucbhelper::Content aContent( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )() );
bExists = aContent.isFolder();
}
- catch (UNO_NMSPC::Exception &)
+ catch (::com::sun::star::uno::Exception &)
{
}
return bExists;
@@ -214,7 +214,7 @@ sal_Bool UCB_GetFileListOfFolder( const String& rURL,
STAR_REFERENCE( sdbc::XResultSet ) xResultSet;
sal_uInt16 nSeqSize = pDateTimeList ? 2 : 1;
- UNO_NMSPC::Sequence < rtl::OUString > aProps( nSeqSize );
+ ::com::sun::star::uno::Sequence < rtl::OUString > aProps( nSeqSize );
rtl::OUString* pProps = aProps.getArray();
pProps[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
if( pDateTimeList )
@@ -224,14 +224,14 @@ sal_Bool UCB_GetFileListOfFolder( const String& rURL,
{
xResultSet = aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY );
}
- catch( UNO_NMSPC::Exception& )
+ catch( ::com::sun::star::uno::Exception& )
{
OSL_FAIL( "create cursor failed!" );
}
if( xResultSet.is() )
{
- STAR_REFERENCE( sdbc::XRow ) xRow( xResultSet, UNO_NMSPC::UNO_QUERY );
+ STAR_REFERENCE( sdbc::XRow ) xRow( xResultSet, ::com::sun::star::uno::UNO_QUERY );
xub_StrLen nExtLen = pExtension ? pExtension->Len() : 0;
try
{
@@ -267,13 +267,13 @@ sal_Bool UCB_GetFileListOfFolder( const String& rURL,
}
bOk = sal_True;
}
- catch( UNO_NMSPC::Exception& )
+ catch( ::com::sun::star::uno::Exception& )
{
OSL_FAIL( "Exception caught!" );
}
}
}
- catch( UNO_NMSPC::Exception& )
+ catch( ::com::sun::star::uno::Exception& )
{
OSL_FAIL( "Exception caught!" );
bOk = sal_False;
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 44a6271..66a68a8 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -467,7 +467,7 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
if (aPasswdDlg.Execute())
{
String sNewPasswd( aPasswdDlg.GetPassword() );
- UNO_NMSPC::Sequence <sal_Int8 > aNewPasswd;
+ ::com::sun::star::uno::Sequence <sal_Int8 > aNewPasswd;
SvPasswordHelper::GetHashPassword( aNewPasswd, sNewPasswd );
if (SvPasswordHelper::CompareHashPassword(
pRepr->GetSectionData().GetPassword(), sNewPasswd))
@@ -623,7 +623,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
aProtectCB .Enable(sal_True);
aFileCB .Enable(sal_True);
- UNO_NMSPC::Sequence <sal_Int8> aCurPasswd;
+ ::com::sun::star::uno::Sequence <sal_Int8> aCurPasswd;
if( 1 < pBox->GetSelectionCount() )
{
aHideCB.EnableTriState( sal_True );
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 0867c37..6c19c61 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -168,7 +168,7 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet,
pRecs->C40_INSERT( SwLabRec, pRec, 0 );
sal_uInt16 nLstGroup = 0;
- const UNO_NMSPC::Sequence<rtl::OUString>& rMan = aLabelsCfg.GetManufacturers();
+ const ::com::sun::star::uno::Sequence<rtl::OUString>& rMan = aLabelsCfg.GetManufacturers();
const rtl::OUString* pMan = rMan.getConstArray();
for(sal_Int32 nMan = 0; nMan < rMan.getLength(); nMan++)
{
@@ -510,7 +510,7 @@ void SwLabPage::InitDatabaseBox()
if( GetNewDBMgr() )
{
aDatabaseLB.Clear();
- UNO_NMSPC::Sequence<rtl::OUString> aDataNames = SwNewDBMgr::GetExistingDatabaseNames();
+ ::com::sun::star::uno::Sequence<rtl::OUString> aDataNames = SwNewDBMgr::GetExistingDatabaseNames();
const rtl::OUString* pDataNames = aDataNames.getConstArray();
for (long i = 0; i < aDataNames.getLength(); i++)
aDatabaseLB.InsertEntry(pDataNames[i]);
commit 97f788ca2bfb9e860b275473934af0ff0b7d76de
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 20 17:29:44 2012 +0100
expand and remove macro STAR_NMSPC
diff --git a/sw/inc/swunodef.hxx b/sw/inc/swunodef.hxx
index 011abcd..6029f8f 100644
--- a/sw/inc/swunodef.hxx
+++ b/sw/inc/swunodef.hxx
@@ -28,11 +28,10 @@
#ifndef _SWUNODEF_HXX
#define _SWUNODEF_HXX
-#define STAR_NMSPC ::com::sun::star
-#define UNO_NMSPC STAR_NMSPC::uno
-#define CLIP_NMSPC STAR_NMSPC::datatransfer::clipboard
+#define UNO_NMSPC ::com::sun::star::uno
+#define CLIP_NMSPC ::com::sun::star::datatransfer::clipboard
-#define STAR_REFERENCE(aType) UNO_NMSPC::Reference< STAR_NMSPC::aType >
+#define STAR_REFERENCE(aType) UNO_NMSPC::Reference< ::com::sun::star::aType >
#endif
diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx
index 9d641c4..f0f1b1d 100644
--- a/sw/inc/toxwrap.hxx
+++ b/sw/inc/toxwrap.hxx
@@ -49,30 +49,30 @@ class String;
class SW_DLLPUBLIC IndexEntrySupplierWrapper
{
- STAR_NMSPC::lang::Locale aLcl;
- STAR_NMSPC::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES;
+ ::com::sun::star::lang::Locale aLcl;
+ ::com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES;
public:
IndexEntrySupplierWrapper();
~IndexEntrySupplierWrapper();
- void SetLocale( const STAR_NMSPC::lang::Locale& rLocale ) { aLcl = rLocale; }
+ void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) { aLcl = rLocale; }
String GetIndexKey( const String& rTxt, const String& rTxtReading,
- const STAR_NMSPC::lang::Locale& rLocale ) const;
+ const ::com::sun::star::lang::Locale& rLocale ) const;
String GetFollowingText( sal_Bool bMorePages ) const;
- STAR_NMSPC::uno::Sequence< ::rtl::OUString >
- GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLcl ) const;
+ ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const;
- sal_Bool LoadAlgorithm( const STAR_NMSPC::lang::Locale& rLcl,
+ sal_Bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl,
const String& sSortAlgorithm, long nOptions ) const;
sal_Int16 CompareIndexEntry( const String& rTxt1, const String& rTxtReading1,
- const STAR_NMSPC::lang::Locale& rLcl1,
+ const ::com::sun::star::lang::Locale& rLcl1,
const String& rTxt2, const String& rTxtReading2,
- const STAR_NMSPC::lang::Locale& rLcl2 ) const;
+ const ::com::sun::star::lang::Locale& rLcl2 ) const;
};
#endif
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 2b7464a..5f26634 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -268,7 +268,7 @@ SwCalc::SwCalc( SwDoc& rD )
if( eLang != SvxLocaleToLanguage( pLclData->getLocale() ) ||
eLang != SvxLocaleToLanguage( pCharClass->getLocale() ) )
{
- STAR_NMSPC::lang::Locale aLocale( SvxCreateLocale( eLang ));
+ ::com::sun::star::lang::Locale aLocale( SvxCreateLocale( eLang ));
STAR_REFERENCE( lang::XMultiServiceFactory ) xMSF(
::comphelper::getProcessServiceFactory() );
pCharClass = new CharClass( xMSF, aLocale );
diff --git a/sw/source/core/inc/toxhlp.hxx b/sw/source/core/inc/toxhlp.hxx
index b254874..62db2c9 100644
--- a/sw/source/core/inc/toxhlp.hxx
+++ b/sw/source/core/inc/toxhlp.hxx
@@ -48,30 +48,30 @@ class String;
class IndexEntrySupplierWrapper
{
- STAR_NMSPC::lang::Locale aLcl;
- STAR_NMSPC::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES;
+ ::com::sun::star::lang::Locale aLcl;
+ ::com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES;
public:
IndexEntrySupplierWrapper(
- const STAR_NMSPC::lang::Locale& rLcl,
+ const ::com::sun::star::lang::Locale& rLcl,
STAR_REFERENCE( lang::XMultiServiceFactory )& rxMSF );
~IndexEntrySupplierWrapper();
String GetIndexKey( const String& rTxt, const String& rTxtReading,
- const STAR_NMSPC::lang::Locale& rLocale ) const;
+ const ::com::sun::star::lang::Locale& rLocale ) const;
String GetFollowingText( sal_Bool bMorePages ) const;
- STAR_NMSPC::uno::Sequence< ::rtl::OUString >
- GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLcl ) const;
+ ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const;
- sal_Bool LoadAlgorithm( const STAR_NMSPC::lang::Locale& rLcl,
+ sal_Bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl,
const String& sSortAlgorithm, long nOptions ) const;
sal_Int16 CompareIndexEntry( const String& rTxt1, const String& rTxtReading1,
- const STAR_NMSPC::lang::Locale& rLcl1,
+ const ::com::sun::star::lang::Locale& rLcl1,
const String& rTxt2, const String& rTxtReading2,
- const STAR_NMSPC::lang::Locale& rLcl2 ) const;
+ const ::com::sun::star::lang::Locale& rLcl2 ) const;
};
#endif
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index f1ae986..dc952ed 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -75,7 +75,7 @@ IndexEntrySupplierWrapper::~IndexEntrySupplierWrapper()
String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt,
const String& rTxtReading,
- const STAR_NMSPC::lang::Locale& rLocale ) const
+ const ::com::sun::star::lang::Locale& rLocale ) const
{
String sRet;
try {
@@ -117,8 +117,8 @@ String IndexEntrySupplierWrapper::GetFollowingText( sal_Bool bMorePages ) const
return sRet;
}
-STAR_NMSPC::uno::Sequence< ::rtl::OUString >
-IndexEntrySupplierWrapper::GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLcl ) const
+::com::sun::star::uno::Sequence< ::rtl::OUString >
+IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const
{
uno::Sequence< ::rtl::OUString > sRet;
@@ -141,7 +141,7 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLc
}
sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
- const STAR_NMSPC::lang::Locale& rLcl,
+ const ::com::sun::star::lang::Locale& rLcl,
const String& sSortAlgorithm, long nOptions ) const
{
sal_Bool bRet = sal_False;
@@ -165,9 +165,9 @@ sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
const String& rTxt1, const String& rTxtReading1,
- const STAR_NMSPC::lang::Locale& rLocale1,
+ const ::com::sun::star::lang::Locale& rLocale1,
const String& rTxt2, const String& rTxtReading2,
- const STAR_NMSPC::lang::Locale& rLocale2 ) const
+ const ::com::sun::star::lang::Locale& rLocale2 ) const
{
sal_Int16 nRet = 0;
try {
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index c3896fa..87d24e1 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -100,8 +100,8 @@ sal_Bool UCB_CopyFile( const String& rURL, const String& rNewURL, sal_Bool bCopy
STAR_REFERENCE( ucb::XCommandEnvironment )());
UNO_NMSPC::Any aAny;
- STAR_NMSPC::ucb::TransferInfo aInfo;
- aInfo.NameClash = STAR_NMSPC::ucb::NameClash::ERROR;
+ ::com::sun::star::ucb::TransferInfo aInfo;
+ aInfo.NameClash = ::com::sun::star::ucb::NameClash::ERROR;
aInfo.NewTitle = sName;
aInfo.SourceURL = rURL;
aInfo.MoveData = bCopyIsMove;
@@ -248,7 +248,7 @@ sal_Bool UCB_GetFileListOfFolder( const String& rURL,
if( pDateTimeList )
{
- STAR_NMSPC::util::DateTime aStamp = xRow->getTimestamp(2);
+ ::com::sun::star::util::DateTime aStamp = xRow->getTimestamp(2);
::DateTime* pDateTime = new ::DateTime(
::Date( aStamp.Day,
aStamp.Month,
diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx
index 4c349a0..cf712f8 100644
--- a/sw/source/ui/inc/uivwimp.hxx
+++ b/sw/source/ui/inc/uivwimp.hxx
@@ -54,7 +54,7 @@ namespace com{ namespace sun{ namespace star {
}}}
class SwScannerEventListener : public ::cppu::WeakImplHelper1<
- STAR_NMSPC::lang::XEventListener >
+ ::com::sun::star::lang::XEventListener >
{
SwView* pView;
@@ -77,7 +77,7 @@ class SwClipboardChangeListener : public ::cppu::WeakImplHelper1<
SwView* pView;
// XEventListener
- virtual void SAL_CALL disposing( const STAR_NMSPC::lang::EventObject& rEventObject )
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObject )
throw ( com::sun::star::uno::RuntimeException );
// XClipboardListener
commit f67efce371f06c0a98684a3446e0da894968dd33
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 20 16:40:21 2012 +0100
svx: simplify this
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index b268213..5081b50 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -224,9 +224,7 @@ void E3dScene::SetDefaultAttributes(E3dDefaultAttributes& /*rDefault*/)
{
// For WIN95/NT turn off the FP-Exceptions
#if defined(WNT)
-#define SC_FPEXCEPTIONS_ON() _control87( _MCW_EM, 0 )
-#define SC_FPEXCEPTIONS_OFF() _control87( _MCW_EM, _MCW_EM )
- SC_FPEXCEPTIONS_OFF();
+ _control87( _MCW_EM, _MCW_EM )
#endif
// Set defaults
commit e7e4871b2880f5690030b1b16978f2575eea3948
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 20 15:05:13 2012 +0100
unusedcode.easy: some cleaning
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 1c0b664..3b9b89d 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -816,7 +816,6 @@ public:
// don't use:
// assigns string / creates forumula cell
void SetOldValue( const rtl::OUString& rOld, ScDocument* pDoc );
- void SetNewValue( const rtl::OUString& rNew, ScDocument* pDoc );
void GetOldString( rtl::OUString& rStr ) const;
void GetNewString( rtl::OUString& rStr ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 343a62d..34193d8 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -467,7 +467,6 @@ public:
* non-empty range name set.
*/
SC_DLLPUBLIC void GetAllTabRangeNames(ScRangeName::TabNameCopyMap& rRangeNames) const;
- SC_DLLPUBLIC void SetAllTabRangeNames(const ScRangeName::TabNameCopyMap& rRangeNames);
SC_DLLPUBLIC void SetAllRangeNames( const boost::ptr_map<rtl::OUString, ScRangeName>& rRangeMap);
SC_DLLPUBLIC void GetTabRangeNameMap(std::map<rtl::OUString, ScRangeName*>& rRangeName);
SC_DLLPUBLIC void GetRangeNameMap(std::map<rtl::OUString, ScRangeName*>& rRangeName);
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 9d7d564..e9a6653 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -129,23 +129,6 @@ void ScDocument::GetAllTabRangeNames(ScRangeName::TabNameCopyMap& rNames) const
rNames.swap(aNames);
}
-void ScDocument::SetAllTabRangeNames(const ScRangeName::TabNameCopyMap& rNames)
-{
- // Remove all existing range names first.
- for (SCTAB i = 0; i < static_cast<SCTAB>(maTabs.size()); ++i)
- {
- if (!maTabs[i])
- // no more tables to iterate through.
- break;
-
- maTabs[i]->SetRangeName(NULL);
- }
-
- ScRangeName::TabNameCopyMap::const_iterator itr = rNames.begin(), itrEnd = rNames.end();
- for (; itr != itrEnd; ++itr)
- SetRangeName(itr->first, new ScRangeName(*itr->second));
-}
-
void ScDocument::SetAllRangeNames( const boost::ptr_map<rtl::OUString, ScRangeName>& rRangeMap)
{
rtl::OUString aGlobalStr(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME));
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 9a2ccb5..65670be 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -1523,12 +1523,6 @@ void ScChangeActionContent::SetOldValue( const rtl::OUString& rOld, ScDocument*
}
-void ScChangeActionContent::SetNewValue( const rtl::OUString& rNew, ScDocument* pDoc )
-{
- SetValueString( aNewValue, pNewCell, rNew, pDoc );
-}
-
-
void ScChangeActionContent::GetOldString( rtl::OUString& rStr ) const
{
GetValueString( rStr, aOldValue, pOldCell );
diff --git a/sc/source/filter/starcalc/collect.cxx b/sc/source/filter/starcalc/collect.cxx
index 090ebfa..fb76f0c 100644
--- a/sc/source/filter/starcalc/collect.cxx
+++ b/sc/source/filter/starcalc/collect.cxx
@@ -89,32 +89,6 @@ ScCollection::~ScCollection()
//------------------------------------------------------------------------
sal_uInt16 ScCollection::GetCount() const { return nCount; }
-void ScCollection::AtFree(sal_uInt16 nIndex)
-{
- if ((pItems) && (nIndex < nCount))
- {
- delete pItems[nIndex];
- --nCount; // before memmove
- memmove ( &pItems[nIndex], &pItems[nIndex + 1], (nCount - nIndex) * sizeof(ScDataObject*));
- pItems[nCount] = NULL;
- }
-}
-
-//------------------------------------------------------------------------
-
-void ScCollection::Free(ScDataObject* pScDataObject)
-{
- AtFree(IndexOf(pScDataObject));
-}
-
-//------------------------------------------------------------------------
-
-void ScCollection::FreeAll()
-{
- lcl_DeleteScDataObjects( pItems, nCount );
- nCount = 0;
- pItems = new ScDataObject*[nLimit];
-}
//------------------------------------------------------------------------
diff --git a/sc/source/filter/starcalc/collect.hxx b/sc/source/filter/starcalc/collect.hxx
index 6444efd..3ec9369 100644
--- a/sc/source/filter/starcalc/collect.hxx
+++ b/sc/source/filter/starcalc/collect.hxx
@@ -53,10 +53,6 @@ public:
virtual ScDataObject* Clone() const;
- void AtFree(sal_uInt16 nIndex);
- void Free(ScDataObject* pScDataObject);
- void FreeAll();
-
sal_Bool AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject);
virtual sal_Bool Insert(ScDataObject* pScDataObject);
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 6ad3de9..42ddcab 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -270,7 +270,6 @@ public:
inline const String GetNameDirect() const { return String(aName, osl_getThreadTextEncoding()); }
String GetName( FSysPathStyle eFormatter = FSYS_STYLE_HOST ) const;
String CutName( FSysPathStyle eFormatter = FSYS_STYLE_HOST );
- void SetBase( const String& rBase, char cSep = '.' );
String GetBase(char cSep = '.' ) const;
DirEntry GetPath() const;
DirEntry GetDevice() const;
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index ca4bef0..3018cf4 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -1534,31 +1534,6 @@ DirEntry DirEntry::GetDevice() const
/*************************************************************************
|*
-|* DirEntry::SetBase()
-|*
-*************************************************************************/
-
-void DirEntry::SetBase( const String& rBase, char cSep )
-{
- DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
-
- const char *p0 = aName.getStr();
- const char *p1 = p0 + aName.getLength() - 1;
- while ( p1 >= p0 && *p1 != cSep )
- p1--;
-
- if ( p1 >= p0 )
- {
- // es wurde ein cSep an der Position p1 gefunden
- aName = rtl::OUStringToOString(rBase, osl_getThreadTextEncoding())
- + aName.copy(p1 - p0);
- }
- else
- aName = rtl::OUStringToOString(rBase, osl_getThreadTextEncoding());
-}
-
-/*************************************************************************
-|*
|* DirEntry::GetSearchDelimiter()
|*
*************************************************************************/
diff --git a/unusedcode.easy b/unusedcode.easy
index a5fe679..21f230a 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -9,7 +9,6 @@ CharPosArray::Replace(int const&, unsigned short)
CharPosArray::Replace(int const*, unsigned short, unsigned short)
CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
Dialog::Dialog(Window*, ResId const&)
-DirEntry::SetBase(String const&, char)
Export::DumpExportList(rtl::OString const&, ExportList&)
FileStream::FileStream(rtl::OString const&, FileAccessMode)
FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short)
@@ -44,11 +43,6 @@ MSDffImportRecords::Remove(unsigned short, unsigned short)
MailDispatcher::removeListener(rtl::Reference<IMailDispatcherListener>)
Matrix3d::Inverse() const
Matrix3d::Matrix3d()
-NumericBox::GetValue(unsigned short) const
-NumericBox::GetValuePos(long) const
-NumericBox::RemoveValue(long)
-NumericFormatter::ConvertToFraction(long)
-NumericFormatter::ConvertToLong(Fraction const&)
OutputDevice::LogicToPixel(PolyPolygon const&, MapMode const&) const
OutputDevice::PixelToLogic(PolyPolygon const&, MapMode const&) const
ParagraphStyleManager::get(WPXString const&) const
@@ -72,11 +66,8 @@ ScAddInDocs::Insert(ScAddInDocs const*, unsigned short, unsigned short)
ScAddInDocs::Insert(ScDocument* const&, unsigned short&)
ScAddInDocs::Insert(ScDocument* const*, unsigned short)
ScAddInDocs::Remove(ScDocument* const&, unsigned short)
-ScChangeActionContent::SetNewValue(rtl::OUString const&, ScDocument*)
ScChartListener::ScChartListener(rtl::OUString const&, ScDocument*, ScRange const&)
ScChartListener::SetName(rtl::OUString const&)
-ScCollection::Free(ScDataObject*)
-ScCollection::FreeAll()
ScCompressedArray<int, unsigned char>::GetEntryCount() const
ScCompressedArray<int, unsigned short>::CopyFrom(ScCompressedArray<int, unsigned short> const&, int, int, long)
ScCompressedArray<int, unsigned short>::GetEntryCount() const
@@ -97,7 +88,6 @@ ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_debug::_Safe_itera
ScDBCollection::AnonDBs::size() const
ScDPSaveDimension::Refresh(com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> const&, std::__debug::list<rtl::OUString, std::allocator<rtl::OUString> > const&)
ScDocRowHeightUpdater::TabRanges::TabRanges()
-ScDocument::SetAllTabRangeNames(std::__debug::map<short, ScRangeName const*, std::less<short>, std::allocator<std::pair<short const, ScRangeName const*> > > const&)
ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
ScHTMLColOffset::Insert(unsigned long const&, unsigned short&)
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index 9f0b320..c9d9911 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -216,8 +216,6 @@ public:
sal_Bool IsValueModified() const;
sal_Int64 GetCorrectedValue() const { return mnCorrectedValue; }
- Fraction ConvertToFraction( sal_Int64 nValue );
- sal_Int64 ConvertToLong( const Fraction& rValue );
sal_Int64 Normalize( sal_Int64 nValue ) const;
sal_Int64 Denormalize( sal_Int64 nValue ) const;
};
@@ -737,10 +735,6 @@ public:
virtual void ReformatAll();
void InsertValue( sal_Int64 nValue, sal_uInt16 nPos = COMBOBOX_APPEND );
- void RemoveValue( sal_Int64 nValue );
- using NumericFormatter::GetValue;
- sal_Int64 GetValue( sal_uInt16 nPos ) const;
- sal_uInt16 GetValuePos( sal_Int64 nPos ) const;
};
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 66176e8..bcb676d 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -651,23 +651,6 @@ sal_Bool NumericFormatter::IsValueModified() const
// -----------------------------------------------------------------------
-Fraction NumericFormatter::ConvertToFraction( sal_Int64 nValue )
-{
- // caution: precision loss in double cast (and in fraction anyhow)
- return Fraction( (double)nValue/(double)ImplPower10( GetDecimalDigits() ) );
-}
-
-// -----------------------------------------------------------------------
-
-sal_Int64 NumericFormatter::ConvertToLong( const Fraction& rValue )
-{
- Fraction aFract = rValue;
- aFract *= Fraction( (long)ImplPower10( GetDecimalDigits() ), 1 );
- return (sal_Int64)(double)aFract;
-}
-
-// -----------------------------------------------------------------------
-
sal_Int64 NumericFormatter::Normalize( sal_Int64 nValue ) const
{
return (nValue * ImplPower10( GetDecimalDigits() ) );
@@ -1042,29 +1025,6 @@ void NumericBox::InsertValue( sal_Int64 nValue, sal_uInt16 nPos )
// -----------------------------------------------------------------------
-void NumericBox::RemoveValue( sal_Int64 nValue )
-{
- ComboBox::RemoveEntry( CreateFieldText( nValue ) );
-}
-
-// -----------------------------------------------------------------------
-
-sal_Int64 NumericBox::GetValue( sal_uInt16 nPos ) const
-{
- double nValue = 0;
- ImplNumericGetValue( ComboBox::GetEntry( nPos ), nValue, GetDecimalDigits(), ImplGetLocaleDataWrapper() );
- return (sal_Int64)nValue;
-}
-
-// -----------------------------------------------------------------------
-
-sal_uInt16 NumericBox::GetValuePos( sal_Int64 nValue ) const
-{
- return ComboBox::GetEntryPos( CreateFieldText( nValue ) );
-}
-
-// -----------------------------------------------------------------------
-
static sal_Bool ImplMetricProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
sal_Bool, sal_Bool bUseThousandSep, const LocaleDataWrapper& rWrapper )
{
commit 3ab04ef5528276682de8b8e91033bf81457d5a56
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 20 13:19:34 2012 +0100
unusedcode.easy: SwProtocol::GetVar
diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx
index eaa1044..cfeead2 100644
--- a/sw/source/core/inc/dbg_lay.hxx
+++ b/sw/source/core/inc/dbg_lay.hxx
@@ -84,7 +84,6 @@ public:
static void Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAction, void* pParam );
static void Init();
static void Stop();
- static void GetVar( const sal_uInt16 nNo, long& rVar );
};
class SwEnterLeave
@@ -103,7 +102,6 @@ public:
#define PROTOCOL_INIT SwProtocol::Init();
#define PROTOCOL_STOP SwProtocol::Stop();
#define PROTOCOL_ENTER( pFrm, nFunc, nAct, pPar ) SwEnterLeave aEnter( pFrm, nFunc, nAct, pPar );
-#define GET_VARIABLE( nNo, nVar ) SwProtocol::GetVar( nNo, nVar );
#else
@@ -111,7 +109,6 @@ public:
#define PROTOCOL_INIT
#define PROTOCOL_STOP
#define PROTOCOL_ENTER( pFrm, nFunc, nAct, pPar )
-#define GET_VARIABLE( nNo, nVar )
#endif
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index f435a17..b3458ff 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -161,8 +161,6 @@ public:
sal_Bool DeleteFrm( sal_uInt16 nFrmId ); // FrmId entfernen, diesen nicht mehr Aufzeichnen
void FileInit(); // Auslesen der INI-Datei
void ChkStream() { if( !pStream ) NewStream(); }
- void GetVar( const sal_uInt16 nNo, long& rVar )
- { if( nNo < aVars.size() ) rVar = aVars[ nNo ]; }
};
/* --------------------------------------------------
@@ -273,12 +271,6 @@ void SwProtocol::Stop()
nRecord = 0;
}
-void SwProtocol::GetVar( const sal_uInt16 nNo, long& rVar )
-{
- if( pImpl )
- pImpl->GetVar( nNo, rVar );
-}
-
SwImplProtocol::SwImplProtocol()
: pStream( NULL ), pFrmIds( NULL ), nTypes( 0xffff ),
nLineCount( 0 ), nMaxLines( USHRT_MAX ), nTestMode( 0 )
diff --git a/unusedcode.easy b/unusedcode.easy
index 0c6dd9e..a5fe679 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -375,7 +375,6 @@ SwPosFlyFrms::Insert(SwPosFlyFrm* const*, unsigned short)
SwPosFlyFrms::Insert(SwPosFlyFrms const*, unsigned short, unsigned short)
SwPosFlyFrms::Remove(SwPosFlyFrm* const&, unsigned short)
SwPosFlyFrms::Remove(unsigned short, unsigned short)
-SwProtocol::GetVar(unsigned short, long&)
SwRects::Replace(SwRect const&, unsigned short)
SwRects::Replace(SwRect const*, unsigned short, unsigned short)
SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwRect const&, void*), void*)
commit f4fbdf7f9c8e657cccb679b341397daabee7079b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 20 13:16:51 2012 +0100
unusedcode.easy: Remove SwProtocol::Snapshot()
And all implementations. Also unused and removed:
ImplCreateFromXImage()
ImplGetFrameBitmap()
diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx
index 4106bbd..eaa1044 100644
--- a/sw/source/core/inc/dbg_lay.hxx
+++ b/sw/source/core/inc/dbg_lay.hxx
@@ -84,7 +84,6 @@ public:
static void Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAction, void* pParam );
static void Init();
static void Stop();
- static void SnapShot( const SwFrm* pFrm, sal_uLong nFlags );
static void GetVar( const sal_uInt16 nNo, long& rVar );
};
@@ -104,7 +103,6 @@ public:
#define PROTOCOL_INIT SwProtocol::Init();
#define PROTOCOL_STOP SwProtocol::Stop();
#define PROTOCOL_ENTER( pFrm, nFunc, nAct, pPar ) SwEnterLeave aEnter( pFrm, nFunc, nAct, pPar );
-#define PROTOCOL_SNAPSHOT( pFrm, nFlags ) SwProtocol::SnapShot( pFrm, nFlags );
#define GET_VARIABLE( nNo, nVar ) SwProtocol::GetVar( nNo, nVar );
#else
@@ -113,7 +111,6 @@ public:
#define PROTOCOL_INIT
#define PROTOCOL_STOP
#define PROTOCOL_ENTER( pFrm, nFunc, nAct, pPar )
-#define PROTOCOL_SNAPSHOT( pFrm, nFlags )
#define GET_VARIABLE( nNo, nVar )
#endif
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index fc166cb..f435a17 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -161,7 +161,6 @@ public:
sal_Bool DeleteFrm( sal_uInt16 nFrmId ); // FrmId entfernen, diesen nicht mehr Aufzeichnen
void FileInit(); // Auslesen der INI-Datei
void ChkStream() { if( !pStream ) NewStream(); }
- void SnapShot( const SwFrm* pFrm, sal_uLong nFlags );
void GetVar( const sal_uInt16 nNo, long& rVar )
{ if( nNo < aVars.size() ) rVar = aVars[ nNo ]; }
};
@@ -274,14 +273,6 @@ void SwProtocol::Stop()
nRecord = 0;
}
-// Creates a more or less detailed snapshot of the layout structur
-
-void SwProtocol::SnapShot( const SwFrm* pFrm, sal_uLong nFlags )
-{
- if( pImpl )
- pImpl->SnapShot( pFrm, nFlags );
-}
-
void SwProtocol::GetVar( const sal_uInt16 nNo, long& rVar )
{
if( pImpl )
@@ -768,40 +759,6 @@ sal_Bool SwImplProtocol::DeleteFrm( sal_uInt16 nId )
return sal_False;
}
-/*--------------------------------------------------
- * SwProtocol::SnapShot(..)
- * creates a snapshot of the given frame and its content.
- * --------------------------------------------------*/
-void SwImplProtocol::SnapShot( const SwFrm* pFrm, sal_uLong nFlags )
-{
- while( pFrm )
- {
- _Record( pFrm, PROT_SNAPSHOT, 0, 0);
- if( pFrm->GetDrawObjs() && nFlags & SNAP_FLYFRAMES )
- {
- aLayer.append(RTL_CONSTASCII_STRINGPARAM("[ "));
- const SwSortedObjs &rObjs = *pFrm->GetDrawObjs();
- for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i )
- {
- SwAnchoredObject* pObj = rObjs[i];
- if ( pObj->ISA(SwFlyFrm) )
- SnapShot( static_cast<SwFlyFrm*>(pObj), nFlags );
- }
- if (aLayer.getLength() > 1)
- aLayer.remove(aLayer.getLength() - 2, aLayer.getLength());
- }
- if( pFrm->IsLayoutFrm() && nFlags & SNAP_LOWER &&
- ( !pFrm->IsTabFrm() || nFlags & SNAP_TABLECONT ) )
- {
- aLayer.append(RTL_CONSTASCII_STRINGPARAM(" "));
- SnapShot( ((SwLayoutFrm*)pFrm)->Lower(), nFlags );
- if (aLayer.getLength() > 1)
- aLayer.remove(aLayer.getLength() - 2, aLayer.getLength());
- }
- pFrm = pFrm->GetNext();
- }
-}
-
/* --------------------------------------------------
* SwEnterLeave::Ctor(..) wird vom eigentlichen (inline-)Kontruktor gerufen,
* wenn die Funktion aufgezeichnet werden soll.
diff --git a/unusedcode.easy b/unusedcode.easy
index 69cb125..0c6dd9e 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -376,7 +376,6 @@ SwPosFlyFrms::Insert(SwPosFlyFrms const*, unsigned short, unsigned short)
SwPosFlyFrms::Remove(SwPosFlyFrm* const&, unsigned short)
SwPosFlyFrms::Remove(unsigned short, unsigned short)
SwProtocol::GetVar(unsigned short, long&)
-SwProtocol::SnapShot(SwFrm const*, unsigned long)
SwRects::Replace(SwRect const&, unsigned short)
SwRects::Replace(SwRect const*, unsigned short, unsigned short)
SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwRect const&, void*), void*)
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 70b247b..f2e77e5 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1621,11 +1621,6 @@ void AquaSalFrame::SetBackgroundBitmap( SalBitmap* )
//TODO: implement
}
-SalBitmap* AquaSalFrame::SnapShot()
-{
- return mpGraphics ? mpGraphics->getBitmap( 0, 0, maGeometry.nWidth, maGeometry.nHeight ) : NULL;
-}
-
SalFrame* AquaSalFrame::GetParent() const
{
return mpParent;
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index a8486b0..ae56142 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -384,11 +384,6 @@ LanguageType SvpSalFrame::GetInputLanguage()
return LANGUAGE_DONTKNOW;
}
-SalBitmap* SvpSalFrame::SnapShot()
-{
- return NULL;
-}
-
void SvpSalFrame::UpdateSettings( AllSettings& )
{
}
diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h
index 879e1dd..50ec407 100644
--- a/vcl/inc/aqua/salframe.h
+++ b/vcl/inc/aqua/salframe.h
@@ -146,7 +146,6 @@ public:
virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode );
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
- virtual SalBitmap* SnapShot();
virtual void UpdateSettings( AllSettings& rSettings );
virtual void Beep( SoundType eSoundType );
virtual const SystemEnvData* GetSystemData() const;
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 2165c5d..3dd8961 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -107,7 +107,6 @@ public:
virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode );
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
- virtual SalBitmap* SnapShot();
virtual void UpdateSettings( AllSettings& rSettings );
virtual void Beep( SoundType eSoundType );
virtual const SystemEnvData* GetSystemData() const;
diff --git a/vcl/inc/ios/salframe.h b/vcl/inc/ios/salframe.h
index b76ddfd..46ff6fc 100644
--- a/vcl/inc/ios/salframe.h
+++ b/vcl/inc/ios/salframe.h
@@ -142,7 +142,6 @@ public:
virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode );
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
- virtual SalBitmap* SnapShot();
virtual void UpdateSettings( AllSettings& rSettings );
virtual void Beep( SoundType eSoundType );
virtual const SystemEnvData* GetSystemData() const;
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 4c412b7..e726483 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -213,8 +213,6 @@ public:
// may be LANGUAGE_DONTKNOW if not supported by the OS
virtual LanguageType GetInputLanguage() = 0;
- virtual SalBitmap* SnapShot() = 0;
-
virtual void UpdateSettings( AllSettings& rSettings ) = 0;
virtual void Beep( SoundType eSoundType ) = 0;
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index ee436da..e5fd0cf 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -393,8 +393,6 @@ public:
// may be LANGUAGE_DONTKNOW if not supported by the OS
virtual LanguageType GetInputLanguage();
- virtual SalBitmap* SnapShot();
-
virtual void UpdateSettings( AllSettings& rSettings );
virtual void Beep( SoundType eSoundType );
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index a5f0bac..31aeeab 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -78,13 +78,6 @@ public:
static void ImplDestroyCache();
void ImplRemovedFromCache();
- bool SnapShot (Display* pDisplay, XLIB_Window hWindow);
- bool ImplCreateFromXImage(
- Display* pDisplay,
- XLIB_Window hWindow,
- SalX11Screen nXScreen,
- XImage* pImage
- );
private:
BitmapBuffer* mpDIB;
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 3ccb875..f03f0e5 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -255,7 +255,6 @@ public:
virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode );
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
- virtual SalBitmap* SnapShot();
virtual void UpdateSettings( AllSettings& rSettings );
virtual void Beep( SoundType eSoundType );
virtual const SystemEnvData* GetSystemData() const;
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index 6a983ec..b6c0411 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -533,8 +533,6 @@ public:
const OutputDevice& rOutDev, const Region& rRegion );
SAL_DLLPRIVATE void ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize,
OutputDevice& rOutDev );
- SAL_DLLPRIVATE void ImplGetFrameBitmap( const Point& rPt, const Size& rSize,
- Bitmap& rBitmap ) const;
SAL_DLLPRIVATE sal_Bool ImplIsRecordLayout() const;
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index ad445b7..f4b79ae 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -950,8 +950,6 @@ public:
void SetData( void* pNewData );
void* GetData() const;
- Bitmap SnapShot( sal_Bool bBorder = sal_True ) const;
-
void ShowFocus( const Rectangle& rRect );
void HideFocus();
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index b252ad3..0d4e206 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -129,7 +129,6 @@ public:
virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode );
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
- virtual SalBitmap* SnapShot();
virtual void UpdateSettings( AllSettings& rSettings );
virtual void Beep( SoundType eSoundType );
virtual const SystemEnvData* GetSystemData() const;
diff --git a/vcl/ios/source/window/salframe.cxx b/vcl/ios/source/window/salframe.cxx
index 10f087e..0665fc9 100644
--- a/vcl/ios/source/window/salframe.cxx
+++ b/vcl/ios/source/window/salframe.cxx
@@ -958,11 +958,6 @@ void IosSalFrame::SetBackgroundBitmap( SalBitmap* )
//TODO: implement
}
-SalBitmap* IosSalFrame::SnapShot()
-{
- return mpGraphics ? mpGraphics->getBitmap( 0, 0, maGeometry.nWidth, maGeometry.nHeight ) : NULL;
-}
-
SalFrame* IosSalFrame::GetParent() const
{
return mpParent;
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 9b0b4f3..1781655 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -1361,19 +1361,6 @@ BitmapEx OutputDevice::GetBitmapEx( const Point& rSrcPt, const Size& rSize ) con
// ------------------------------------------------------------------
-void OutputDevice::ImplGetFrameBitmap( const Point& rDestPt, const Size& rSize,
- Bitmap& rBitmap ) const
-{
- DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
-
- sal_Bool bOldMap = mbMap;
- ((OutputDevice*)this)->mbMap = sal_False;
- rBitmap = GetBitmap( rDestPt, rSize );
- ((OutputDevice*)this)->mbMap = bOldMap;
-}
-
-// ------------------------------------------------------------------
-
Color OutputDevice::GetPixel( const Point& rPt ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 16972ad..e9b4338 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -302,42 +302,6 @@ void Window::ImplInvalidateAllOverlapBackgrounds()
}
}
-// =======================================================================
-
-Bitmap Window::SnapShot( sal_Bool bBorder ) const
-{
- DBG_CHKTHIS( Window, ImplDbgCheckWindow );
-
- Bitmap aBmp;
-
- if ( IsReallyVisible() )
- {
- if ( bBorder && mpWindowImpl->mpBorderWindow )
- aBmp = mpWindowImpl->mpBorderWindow->SnapShot();
- else
- {
- ((Window*)this)->Update();
-
- if ( bBorder && mpWindowImpl->mbFrame )
- {
- SalBitmap* pSalBmp = mpWindowImpl->mpFrame->SnapShot();
-
- if ( pSalBmp )
- {
- ImpBitmap* pImpBmp = new ImpBitmap;
- pImpBmp->ImplSetSalBitmap( pSalBmp );
- aBmp.ImplSetImpBitmap( pImpBmp );
- return aBmp;
- }
- }
-
- mpWindowImpl->mpFrameWindow->ImplGetFrameBitmap( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ), aBmp );
- }
- }
-
- return aBmp;
-}
-
// -----------------------------------------------------------------------
void Window::ShowFocus( const Rectangle& rRect )
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 0eccf20..cd617b8 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -565,100 +565,6 @@ bool X11SalBitmap::ImplCreateFromDrawable(
}
// -----------------------------------------------------------------------------
-bool X11SalBitmap::SnapShot (Display* pDisplay, XLIB_Window hWindow)
-{
- if (hWindow != None)
- {
- XWindowAttributes aAttribute;
- XGetWindowAttributes (pDisplay, hWindow, &aAttribute);
- if (aAttribute.map_state == IsViewable)
- {
- // get coordinates relative to root window
- XLIB_Window hPetitFleur;
- int nRootX, nRootY;
-
- if (XTranslateCoordinates (pDisplay, hWindow, aAttribute.root,
- 0, 0, &nRootX, &nRootY, &hPetitFleur))
- {
- XWindowAttributes aRootAttribute;
- XGetWindowAttributes (pDisplay, aAttribute.root, &aRootAttribute);
-
- int width = aAttribute.width;
- int height = aAttribute.height;
- int x = nRootX;
- int y = nRootY;
-
- // horizontal range check
- if (x < 0)
- {
- width = width + x;
- x = 0;
- }
- else
- if (x > aRootAttribute.width)
- {
- width = 0;
- x = aRootAttribute.width;
- }
- else
- if (x + width > aRootAttribute.width)
- {
- width = aRootAttribute.width - x;
- }
-
- // vertical range check
- if (y < 0)
- {
- height = height + y;
- y = 0;
- }
- else
- if (y > aRootAttribute.height)
- {
- height = 0;
- y = aRootAttribute.height;
- }
- else
- if (y + height > aRootAttribute.height)
- {
- height = aRootAttribute.height - y;
- }
-
- if ((width > 0) && (height > 0))
- {
- XImage* pImage = XGetImage( pDisplay, aAttribute.root,
- x, y, width, height, AllPlanes, ZPixmap );
- bool bSnapShot = ImplCreateFromXImage(
- pDisplay, aAttribute.root,
- SalX11Screen (XScreenNumberOfScreen( aAttribute.screen ) ),
- pImage );
- XDestroyImage (pImage);
-
- return bSnapShot;
- }
- }
- }
- }
-
- return False;
-}
-
-bool X11SalBitmap::ImplCreateFromXImage (
- Display* pDisplay,
- XLIB_Window hWindow,
- SalX11Screen nScreen,
- XImage* pImage
-) {
- Destroy();
-
- if (pImage != NULL && pImage->width != 0 && pImage->height != 0 && pImage->depth != 0)
- {
- mpDDB = new ImplSalDDB (pDisplay, hWindow, nScreen, pImage);
- return True;
- }
- return False;
-}
-
ImplSalDDB* X11SalBitmap::ImplGetDDB(
Drawable aDrawable,
SalX11Screen nXScreen,
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index c882790..141289f 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -1805,54 +1805,6 @@ sal_Bool X11SalFrame::GetWindowState( SalFrameState* pState )
return sal_True;
}
-// ----------------------------------------------------------------------------
-// get a screenshot of the current frame including window manager decoration
-SalBitmap* X11SalFrame::SnapShot()
-{
- Display* pDisplay = GetXDisplay();
-
- // make sure the frame has been reparented and all paint timer have been
- // expired
- do
- {
- XSync(pDisplay, False);
- Application::Reschedule ();
- }
- while (XPending(pDisplay));
- TimeValue aVal;
- aVal.Seconds = 0;
- aVal.Nanosec = 50000000;
- osl_waitThread( &aVal );
- do
- {
- XSync(pDisplay, False);
- Application::Reschedule ();
- }
- while (XPending(pDisplay));
-
- // get the most outer window, usually the window manager decoration
- Drawable hWindow = None;
- if (IsOverrideRedirect())
- hWindow = GetDrawable();
- else
- if (hPresentationWindow != None)
- hWindow = hPresentationWindow;
- else
- hWindow = GetStackingWindow();
-
- // query the contents of the window
- if (hWindow != None)
- {
- X11SalBitmap *pBmp = new X11SalBitmap;
- if (pBmp->SnapShot (pDisplay, hWindow))
- return pBmp;
- else
- delete pBmp;
- }
-
- return NULL;
-}
-
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
// native menu implementation - currently empty
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index f889e61..7f4db68 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2446,32 +2446,6 @@ LanguageType GtkSalFrame::GetInputLanguage()
return LANGUAGE_DONTKNOW;
}
-SalBitmap* GtkSalFrame::SnapShot()
-{
- if( !m_pWindow )
- return NULL;
-
-#if GTK_CHECK_VERSION(3,0,0)
- SvpSalGraphics *pGraphics = static_cast<SvpSalGraphics *>(GetGraphics());
- if (!pGraphics)
- return NULL;
-
- SalBitmap *pRet = pGraphics->getBitmap( 0, 0, maGeometry.nWidth, maGeometry.nHeight );
- ReleaseGraphics( pGraphics );
-
- return pRet;
-#else
- X11SalBitmap *pBmp = new X11SalBitmap;
- if( pBmp->SnapShot( GDK_DISPLAY_XDISPLAY( getGdkDisplay() ),
- widget_get_xid(m_pWindow) ) )
- return pBmp;
- else
- delete pBmp;
-#endif
-
- return NULL;
-}
-
void GtkSalFrame::UpdateSettings( AllSettings& rSettings )
{
if( ! m_pWindow )
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 2243e21..55630a8 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2958,39 +2958,6 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
// -----------------------------------------------------------------------
-SalBitmap* WinSalFrame::SnapShot()
-{
- WinSalBitmap* pSalBitmap = NULL;
-
- RECT aRect;
- GetWindowRect( mhWnd, &aRect );
-
- int nDX = aRect.right-aRect.left;
- int nDY = aRect.bottom-aRect.top;
- HDC hDC = GetWindowDC( mhWnd );
- HBITMAP hBmpBitmap = CreateCompatibleBitmap( hDC, nDX, nDY );
- HDC hBmpDC = ImplGetCachedDC( CACHED_HDC_1, hBmpBitmap );
- sal_Bool bRet;
-
- bRet = BitBlt( hBmpDC, 0, 0, nDX, nDY, hDC, 0, 0, SRCCOPY ) ? TRUE : FALSE;
- ImplReleaseCachedDC( CACHED_HDC_1 );
-
- if ( bRet )
- {
- pSalBitmap = new WinSalBitmap;
-
- if ( !pSalBitmap->Create( hBmpBitmap, FALSE, FALSE ) )
- {
- delete pSalBitmap;
- pSalBitmap = NULL;
- }
- }
-
- return pSalBitmap;
-}
-
-// -----------------------------------------------------------------------
-
const SystemEnvData* WinSalFrame::GetSystemData() const
{
return &maSysData;
More information about the Libreoffice-commits
mailing list