[Libreoffice-commits] .: 21 commits - basic/source editeng/source sfx2/inc sfx2/source svx/inc svx/Library_svx.mk svx/source xmloff/source xmlscript/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jul 11 01:29:00 PDT 2011
basic/source/inc/runtime.hxx | 9
basic/source/runtime/methods.cxx | 22 --
editeng/source/editeng/editobj.cxx | 81 -------
editeng/source/misc/svxacorr.cxx | 49 ----
editeng/source/outliner/outliner.cxx | 19 -
sfx2/inc/sfx2/sfxbasecontroller.hxx | 2
sfx2/source/appl/appserv.cxx | 10
sfx2/source/bastyp/misc.cxx | 16 -
sfx2/source/bastyp/progress.cxx | 16 -
sfx2/source/control/bindings.cxx | 13 -
sfx2/source/control/shell.cxx | 25 --
sfx2/source/inc/sfxtypes.hxx | 4
sfx2/source/view/sfxbasecontroller.cxx | 21 -
svx/Library_svx.mk | 1
svx/inc/svx/svdtrans.hxx | 13 -
svx/source/dialog/rubydialog.cxx | 13 -
svx/source/engine3d/obj3d.cxx | 1
svx/source/inc/svdoimp.hxx | 105 ---------
svx/source/svdraw/impgrfll.cxx | 258 ------------------------
svx/source/svdraw/svdmodel.cxx | 26 --
svx/source/svdraw/svdoattr.cxx | 1
svx/source/svdraw/svdobj.cxx | 1
svx/source/svdraw/svdocirc.cxx | 1
svx/source/svdraw/svdoedge.cxx | 1
svx/source/svdraw/svdomeas.cxx | 1
svx/source/svdraw/svdopath.cxx | 1
svx/source/svdraw/svdorect.cxx | 1
svx/source/svdraw/svdtrans.cxx | 103 ---------
svx/source/tbxctrls/tbcontrl.cxx | 18 -
xmloff/source/chart/SchXMLExport.cxx | 24 --
xmloff/source/xforms/xformsapi.cxx | 5
xmloff/source/xforms/xformsapi.hxx | 2
xmlscript/source/xmldlg_imexp/imp_share.hxx | 1
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 21 -
34 files changed, 885 deletions(-)
New commits:
commit 326547a6f1f7dbfbdb582d27bbc838c10a68ac13
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 22:38:57 2011 +0100
various unused methods
diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx
index d4f3131..954e08b 100644
--- a/svx/inc/svx/svdtrans.hxx
+++ b/svx/inc/svx/svdtrans.hxx
@@ -65,29 +65,20 @@ inline void MovePoint(Point& rPnt, const Size& S) { rPnt.X()+=S.Width();
inline void MovePoly(Polygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); }
inline void MovePoly(PolyPolygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); }
void MoveXPoly(XPolygon& rPoly, const Size& S);
-void MoveXPoly(XPolyPolygon& rPoly, const Size& S);
SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bNoJustify = false);
inline void ResizePoint(Point& rPnt, const Point& rRef, Fraction xFact, Fraction yFact);
void ResizePoly(Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact);
void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact);
-void ResizePoly(PolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact);
-void ResizeXPoly(XPolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact);
inline void RotatePoint(Point& rPnt, const Point& rRef, double sn, double cs);
SVX_DLLPUBLIC void RotatePoly(Polygon& rPoly, const Point& rRef, double sn, double cs);
void RotateXPoly(XPolygon& rPoly, const Point& rRef, double sn, double cs);
-void RotatePoly(PolyPolygon& rPoly, const Point& rRef, double sn, double cs);
void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs);
-// MirrorRect macht nur Sinn bei Spiegelachsen
-// mit einem durch 45 Degree teilbaren Winkel!
-void MirrorRect(Rectangle& rRect, const Point& rRef1, const Point& rRef2, bool bNoJustify); // ni.
void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2);
void MirrorPoly(Polygon& rPoly, const Point& rRef1, const Point& rRef2);
void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2);
-void MirrorPoly(PolyPolygon& rPoly, const Point& rRef1, const Point& rRef2);
-void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2);
inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear = false);
SVX_DLLPUBLIC void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, bool bVShear = false);
@@ -264,8 +255,6 @@ public:
// Fuer die Umrechnung von Masseinheiten
SVX_DLLPUBLIC FrPair GetMapFactor(MapUnit eS, MapUnit eD);
-FrPair GetMapFactor(MapUnit eS, FieldUnit eD);
-FrPair GetMapFactor(FieldUnit eS, MapUnit eD);
FrPair GetMapFactor(FieldUnit eS, FieldUnit eD);
inline bool IsMetric(MapUnit eU) {
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 172d21d..fd0dc4a 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -38,20 +38,11 @@
#include <tools/debug.hxx>
#include <unotools/syslocale.hxx>
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
void MoveXPoly(XPolygon& rPoly, const Size& S)
{
rPoly.Move(S.Width(),S.Height());
}
-void MoveXPoly(XPolyPolygon& rPoly, const Size& S)
-{
- rPoly.Move(S.Width(),S.Height());
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, const Fraction& ryFact, bool bNoJustify)
{
Fraction xFact(rxFact);
@@ -107,24 +98,6 @@ void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, cons
}
}
-void ResizePoly(PolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
-{
- sal_uInt16 nAnz=rPoly.Count();
- for (sal_uInt16 i=0; i<nAnz; i++) {
- ResizePoly(rPoly[i],rRef,xFact,yFact);
- }
-}
-
-void ResizeXPoly(XPolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
-{
- sal_uInt16 nAnz=rPoly.Count();
- for (sal_uInt16 i=0; i<nAnz; i++) {
- ResizeXPoly(rPoly[i],rRef,xFact,yFact);
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
void RotatePoly(Polygon& rPoly, const Point& rRef, double sn, double cs)
{
sal_uInt16 nAnz=rPoly.GetSize();
@@ -141,14 +114,6 @@ void RotateXPoly(XPolygon& rPoly, const Point& rRef, double sn, double cs)
}
}
-void RotatePoly(PolyPolygon& rPoly, const Point& rRef, double sn, double cs)
-{
- sal_uInt16 nAnz=rPoly.Count();
- for (sal_uInt16 i=0; i<nAnz; i++) {
- RotatePoly(rPoly[i],rRef,sn,cs);
- }
-}
-
void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs)
{
sal_uInt16 nAnz=rPoly.Count();
@@ -157,14 +122,6 @@ void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs)
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void MirrorRect(Rectangle& rRect, const Point& /*rRef1*/, const Point& /*rRef2*/, bool bNoJustify)
-{
- // !!! fehlende Implementation !!!
- if (!bNoJustify) rRect.Justify();
-}
-
void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2)
{
long mx=rRef2.X()-rRef1.X();
@@ -216,24 +173,6 @@ void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2)
}
}
-void MirrorPoly(PolyPolygon& rPoly, const Point& rRef1, const Point& rRef2)
-{
- sal_uInt16 nAnz=rPoly.Count();
- for (sal_uInt16 i=0; i<nAnz; i++) {
- MirrorPoly(rPoly[i],rRef1,rRef2);
- }
-}
-
-void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2)
-{
- sal_uInt16 nAnz=rPoly.Count();
- for (sal_uInt16 i=0; i<nAnz; i++) {
- MirrorXPoly(rPoly[i],rRef1,rRef2);
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, bool bVShear)
{
sal_uInt16 nAnz=rPoly.GetSize();
@@ -772,30 +711,6 @@ FrPair GetMapFactor(MapUnit eS, MapUnit eD)
return aRet;
};
-FrPair GetMapFactor(MapUnit eS, FieldUnit eD)
-{
- FrPair aS(GetInchOrMM(eS));
- FrPair aD(GetInchOrMM(eD));
- bool bSInch=IsInch(eS);
- bool bDInch=IsInch(eD);
- FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y());
- if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); }
- if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); }
- return aRet;
-};
-
-FrPair GetMapFactor(FieldUnit eS, MapUnit eD)
-{
- FrPair aS(GetInchOrMM(eS));
- FrPair aD(GetInchOrMM(eD));
- bool bSInch=IsInch(eS);
- bool bDInch=IsInch(eD);
- FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y());
- if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); }
- if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); }
- return aRet;
-};
-
FrPair GetMapFactor(FieldUnit eS, FieldUnit eD)
{
if (eS==eD) return FrPair(1,1,1,1);
commit 00a13308658bd66e65f86fb14a8d818340f7b6bc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 01:45:11 2011 +0100
unused methods
diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx
index 530991f..f166ad1 100644
--- a/xmloff/source/xforms/xformsapi.cxx
+++ b/xmloff/source/xforms/xformsapi.cxx
@@ -85,11 +85,6 @@ Reference<XPropertySet> lcl_createXFormsModel()
return lcl_createPropertySet( OUSTRING( "com.sun.star.xforms.Model" ) );
}
-Reference<XPropertySet> lcl_createXFormsBinding()
-{
- return lcl_createPropertySet( OUSTRING( "com.sun.star.xforms.Binding" ) );
-}
-
void lcl_addXFormsModel(
const Reference<frame::XModel>& xDocument,
const Reference<XPropertySet>& xModel )
diff --git a/xmloff/source/xforms/xformsapi.hxx b/xmloff/source/xforms/xformsapi.hxx
index 973bfb5..6864aa5 100644
--- a/xmloff/source/xforms/xformsapi.hxx
+++ b/xmloff/source/xforms/xformsapi.hxx
@@ -49,8 +49,6 @@ class SvXMLNamespaceMap;
com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> lcl_createXFormsModel();
-com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> lcl_createXFormsBinding();
-
void lcl_addXFormsModel(
const com::sun::star::uno::Reference<com::sun::star::frame::XModel>& xDocument,
const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xModel );
commit bb4b9108bdf9486e451e927057dcfe05b8e91684
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 01:42:14 2011 +0100
callcatcher: unused ImpGetDefaultFontsLanguage
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 30dea42..565bb72 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -819,32 +819,6 @@ void SdrModel::SetTextDefaults() const
SetTextDefaults( pItemPool, nDefTextHgt );
}
-void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rComplex)
-{
- const sal_uInt16 nItemCnt = 3;
- static struct {
- sal_uInt16 nFntType, nLanguage;
- } aOutTypeArr[ nItemCnt ] = {
- { DEFAULTFONT_LATIN_TEXT, LANGUAGE_ENGLISH_US },
- { DEFAULTFONT_CJK_TEXT, LANGUAGE_ENGLISH_US },
- { DEFAULTFONT_CTL_TEXT, LANGUAGE_ARABIC_SAUDI_ARABIA }
- };
- SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex };
-
- for( sal_uInt16 n = 0; n < nItemCnt; ++n )
- {
- Font aFnt( OutputDevice::GetDefaultFont(
- aOutTypeArr[ n ].nFntType, aOutTypeArr[ n ].nLanguage,
- DEFAULTFONT_FLAGS_ONLYONE, 0 ));
- SvxFontItem* pI = aItemArr[ n ];
- pI->SetFamily( aFnt.GetFamily());
- pI->SetFamilyName( aFnt.GetName());
- pI->SetStyleName( String() );
- pI->SetPitch( aFnt.GetPitch());
- pI->SetCharSet( aFnt.GetCharSet() );
- }
-}
-
void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt )
{
// #95114# set application-language specific dynamic pool language defaults
commit f37f18ca401068cf908469535ba1de7708244b8e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 01:41:33 2011 +0100
various unused methods and impl source files
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index aba2265..44b1151 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -184,7 +184,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/stbctrls/zoomctrl \
svx/source/svdraw/ActionDescriptionProvider \
svx/source/smarttags/SmartTagMgr \
- svx/source/svdraw/impgrfll \
svx/source/table/accessiblecell \
svx/source/table/accessibletableshape \
svx/source/table/celleditsource \
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index d7d9032..f1b543b 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -70,7 +70,6 @@
#include <svtools/colorcfg.hxx>
#include <editeng/eeitem.hxx>
#include <svx/xgrscit.hxx>
-#include "svdoimp.hxx"
#include <svx/sdr/properties/e3dproperties.hxx>
#include <svx/sdr/properties/e3dcompoundproperties.hxx>
#include <basegfx/polygon/b3dpolypolygontools.hxx>
diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx
deleted file mode 100644
index 66c1caf..0000000
--- a/svx/source/inc/svdoimp.hxx
+++ /dev/null
@@ -1,105 +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 _SVX_SVDOIMP_HXX
-#define _SVX_SVDOIMP_HXX
-
-#include <vcl/mapmod.hxx>
-
-#include <svx/rectenum.hxx>
-
-
-class Bitmap;
-
-///////////////////////////////////////////////////////////////////////////////
-
-// #104609# Extracted from old XOutDev's ImpCalcBmpFillStartValues
-
-/** Calc offset and size for bitmap fill
-
- This method calculates the size and the offset from the left, top
- position of a shape in logical coordinates
-
- @param rStartOffset
- The offset from the left, top position of the output rectangle is returned
-
- @param rBmpOutputSize
- The output size of the bitmap is returned herein
-
- @param rOutputRect
- Specifies the output rectangle into which the bitmap should be tiled into
-
- @param rOutputMapMode
- Specifies the logical coordinate system the output rectangle is in
-
- @param rFillBitmap
- Specifies the bitmap to fill with
-
- @param rBmpSize
- The desired destination bitmap size. If null, size is taken from the bitmap
-
- @param rBmpPerCent
- Percentage of bitmap size, relative to the output rectangle
-
- @param rBmpOffPerCent
- Offset for bitmap tiling, in percentage relative to bitmap output size
-
- @param bBmpLogSize
- True when using the preferred bitmap size, False when using the percentage value
-
- @param bBmpTile
- True for tiling. False only paints one instance of the bitmap
-
- @param bBmpStretch
- True if bitmap should be stretched to output rect dimension
-
- @param eBmpRectPoint
- Position of the start point relative to the bitmap
-
- */
-void ImpCalcBmpFillSizes( Size& rStartOffset,
- Size& rBmpOutputSize,
- const Rectangle& rOutputRect,
- const MapMode& rOutputMapMode,
- const Bitmap& rFillBitmap,
- const Size& rBmpSize,
- const Size& rBmpPerCent,
- const Size& rBmpOffPerCent,
- sal_Bool bBmpLogSize,
- sal_Bool bBmpTile,
- sal_Bool bBmpStretch,
- RECT_POINT eBmpRectPoint );
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#endif // _SVX_SVDOIMP_HXX
-
-// eof
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/impgrfll.cxx b/svx/source/svdraw/impgrfll.cxx
deleted file mode 100644
index d2cedab..0000000
--- a/svx/source/svdraw/impgrfll.cxx
+++ /dev/null
@@ -1,258 +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_svx.hxx"
-#include <svx/rectenum.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/bitmap.hxx>
-
-///////////////////////////////////////////////////////////////////////////////
-
-void ImpCalcBmpFillSizes( Size& rStartOffset,
- Size& rBmpOutputSize,
- const Rectangle& rOutputRect,
- const MapMode& rOutputMapMode,
- const Bitmap& rFillBitmap,
- const Size& rBmpSize,
- const Size& rBmpPerCent,
- const Size& rBmpOffPerCent,
- sal_Bool bBmpLogSize,
- sal_Bool bBmpTile,
- sal_Bool bBmpStretch,
- RECT_POINT eBmpRectPoint )
-{
- sal_Bool bOriginalSize = sal_False, bScaleSize = sal_False;
-
- // Falls keine Groessen gegeben sind ( z.B. alte Dokumente )
- // berechnen wir uns die Groesse selber aus der Bitmap
- // ==> altes Verhalten;
- // wenn nur eine Groesse gegeben ist, wird die andere
- // Groesse angepasst berechnet
- if( bBmpLogSize )
- {
- if( !rBmpSize.Width() && !rBmpSize.Height() )
- bOriginalSize = sal_True;
- else if( !rBmpSize.Width() || !rBmpSize.Height() )
- bScaleSize = sal_True;
- }
- else
- {
- if( !rBmpPerCent.Width() && !rBmpPerCent.Height() )
- bOriginalSize = sal_True;
- else if( !rBmpPerCent.Width() || !rBmpPerCent.Height() )
- bScaleSize = sal_True;
- }
-
- // entweder Originalgroesse oder angepasste Groesse
- if( bOriginalSize || bScaleSize )
- {
- MapMode aBmpPrefMapMode( rFillBitmap.GetPrefMapMode() );
- Size aBmpPrefSize( rFillBitmap.GetPrefSize() );
-
- // Falls keine gesetzt ist, nehmen wir Pixel
- if( !aBmpPrefSize.Width() || !aBmpPrefSize.Height() )
- {
- aBmpPrefSize = rFillBitmap.GetSizePixel();
- aBmpPrefMapMode = MAP_PIXEL;
- }
-
- if( bOriginalSize )
- {
- if( MAP_PIXEL == aBmpPrefMapMode.GetMapUnit() )
- rBmpOutputSize = Application::GetDefaultDevice()->PixelToLogic( aBmpPrefSize, rOutputMapMode );
- else
- rBmpOutputSize = OutputDevice::LogicToLogic( aBmpPrefSize, aBmpPrefMapMode, rOutputMapMode );
- }
- else
- {
- if( bBmpLogSize )
- {
- rBmpOutputSize = rBmpSize;
-
- if( !rBmpSize.Width() )
- rBmpOutputSize.Width() = basegfx::fround( (double) rBmpSize.Height() * aBmpPrefSize.Width() / aBmpPrefSize.Height() );
- else
- rBmpOutputSize.Height() = basegfx::fround( (double) rBmpSize.Width() * aBmpPrefSize.Height() / aBmpPrefSize.Width() );
- }
- else
- {
- if( !rBmpPerCent.Width() )
- {
- rBmpOutputSize.Height() = basegfx::fround( (double) rOutputRect.GetHeight() * rBmpPerCent.Height() / 100. );
- rBmpOutputSize.Width() = basegfx::fround( (double) rBmpOutputSize.Height() * aBmpPrefSize.Width() / aBmpPrefSize.Height() );
- }
- else
- {
- rBmpOutputSize.Width() = basegfx::fround( (double) rOutputRect.GetWidth() * rBmpPerCent.Width() / 100. );
- rBmpOutputSize.Height() = basegfx::fround( (double) rBmpOutputSize.Width() * aBmpPrefSize.Height() / aBmpPrefSize.Width() );
- }
- }
- }
- }
- // ansonsten koennen wir die Groesse leicht selber berechnen
- else
- {
- if( bBmpLogSize )
- rBmpOutputSize = rBmpSize;
- else
- {
- rBmpOutputSize.Width() = basegfx::fround( (double) rOutputRect.GetWidth() * rBmpPerCent.Width() / 100. );
- rBmpOutputSize.Height() = basegfx::fround( (double) rOutputRect.GetHeight() * rBmpPerCent.Height() / 100. );
- }
- }
-
- // nur bei Kachelung die anderen Positionen berechnen
- if( bBmpTile )
- {
- Point aStartPoint;
-
- // Grundposition der ersten Kachel berechen;
- // Diese Position wird spaeter zur Berechnung der absoluten
- // Startposition links oberhalb des Objektes benutzt
- switch( eBmpRectPoint )
- {
- case( RP_MT ):
- {
- aStartPoint.X() = rOutputRect.Left() + ( ( rOutputRect.GetWidth() - rBmpOutputSize.Width() ) >> 1 );
- aStartPoint.Y() = rOutputRect.Top();
- }
- break;
-
- case( RP_RT ):
- {
- aStartPoint.X() = rOutputRect.Right() - rBmpOutputSize.Width();
- aStartPoint.Y() = rOutputRect.Top();
- }
- break;
-
- case( RP_LM ):
- {
- aStartPoint.X() = rOutputRect.Left();
- aStartPoint.Y() = rOutputRect.Top() + ( ( rOutputRect.GetHeight() - rBmpOutputSize.Height() ) >> 1 );
- }
- break;
-
- case( RP_MM ):
- {
- aStartPoint.X() = rOutputRect.Left() + ( ( rOutputRect.GetWidth() - rBmpOutputSize.Width() ) >> 1 );
- aStartPoint.Y() = rOutputRect.Top() + ( ( rOutputRect.GetHeight() - rBmpOutputSize.Height() ) >> 1 );
- }
- break;
-
- case( RP_RM ):
- {
- aStartPoint.X() = rOutputRect.Right() - rBmpOutputSize.Width();
- aStartPoint.Y() = rOutputRect.Top() + ( ( rOutputRect.GetHeight() - rBmpOutputSize.Height() ) >> 1 );
- }
- break;
-
- case( RP_LB ):
- {
- aStartPoint.X() = rOutputRect.Left();
- aStartPoint.Y() = rOutputRect.Bottom() - rBmpOutputSize.Height();
- }
- break;
-
- case( RP_MB ):
- {
- aStartPoint.X() = rOutputRect.Left() + ( ( rOutputRect.GetWidth() - rBmpOutputSize.Width() ) >> 1 );
- aStartPoint.Y() = rOutputRect.Bottom() - rBmpOutputSize.Height();
- }
- break;
-
- case( RP_RB ):
- {
- aStartPoint.X() = rOutputRect.Right() - rBmpOutputSize.Width();
- aStartPoint.Y() = rOutputRect.Bottom() - rBmpOutputSize.Height();
- }
- break;
-
- // default linke obere Ecke
- default:
- aStartPoint = rOutputRect.TopLeft();
- break;
- }
-
- // X- oder Y-Positionsoffset beruecksichtigen
- if( rBmpOffPerCent.Width() )
- aStartPoint.X() += ( rBmpOutputSize.Width() * rBmpOffPerCent.Width() / 100 );
-
- if( rBmpOffPerCent.Height() )
- aStartPoint.Y() += ( rBmpOutputSize.Height() * rBmpOffPerCent.Height() / 100 );
-
- // echten Startpunkt berechnen ( links oben )
- if( rBmpOutputSize.Width() && rBmpOutputSize.Height() )
- {
- const long nDiffX = aStartPoint.X() - rOutputRect.Left();
- const long nDiffY = aStartPoint.Y() - rOutputRect.Top();
-
- if ( nDiffX )
- {
- long nCount = nDiffX / rBmpOutputSize.Width() + 1;
-
- if ( rBmpOffPerCent.Height() && ( nCount & 1L ) )
- nCount++;
-
- aStartPoint.X() -= ( nCount * rBmpOutputSize.Width() );
- }
-
- if ( nDiffY )
- {
- long nCount = nDiffY / rBmpOutputSize.Height() + 1;
-
- if ( rBmpOffPerCent.Width() && ( nCount & 1L ) )
- nCount++;
-
- aStartPoint.Y() -= ( nCount * rBmpOutputSize.Height() );
- }
- }
-
- rStartOffset = Size( aStartPoint.X() - rOutputRect.Left(),
- aStartPoint.Y() - rOutputRect.Top() );
- }
- else
- {
- if( bBmpStretch )
- {
- rStartOffset = Size(0, 0);
- rBmpOutputSize = rOutputRect.GetSize();
- }
- else
- {
- rStartOffset = Size( ( rOutputRect.GetWidth() - rBmpOutputSize.Width() ) >> 1,
- ( rOutputRect.GetHeight() - rBmpOutputSize.Height() ) >> 1 );
- }
- }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 39e0039..9fa6a50 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -85,7 +85,6 @@
#include <svx/sdr/properties/attributeproperties.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include "svx/xlinjoit.hxx"
-#include <svdoimp.hxx>
//////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index cde1339..5c40cfd 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -96,7 +96,6 @@
#include <svx/fmmodel.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/objface.hxx>
-#include "svdoimp.hxx"
#include <vcl/graphictools.hxx>
#include <svtools/colorcfg.hxx>
#include <svx/sdr/properties/emptyproperties.hxx>
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 86cb1eb..23bf13f 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -51,7 +51,6 @@
#include "svx/svdglob.hxx" // StringCache
#include "svx/svdstr.hrc" // Objektname
#include <editeng/eeitem.hxx>
-#include "svdoimp.hxx"
#include <svx/sdr/properties/circleproperties.hxx>
#include <svx/sdr/contact/viewcontactofsdrcircobj.hxx>
#include <basegfx/point/b2dpoint.hxx>
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 577638e..5a71a00 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -49,7 +49,6 @@
#include <svl/style.hxx>
#include <svl/smplhint.hxx>
#include <editeng/eeitem.hxx>
-#include "svdoimp.hxx"
#include <svx/sdr/properties/connectorproperties.hxx>
#include <svx/sdr/contact/viewcontactofsdredgeobj.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 8226616..011e8e4 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -62,7 +62,6 @@
#include <svx/svdopath.hxx>
#include <svx/svdpage.hxx>
#include <unotools/syslocale.hxx>
-#include "svdoimp.hxx"
#include <svx/sdr/properties/measureproperties.hxx>
#include <svx/sdr/contact/viewcontactofsdrmeasureobj.hxx>
#include <basegfx/point/b2dpoint.hxx>
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 6ec3f87..c3f84d8 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -57,7 +57,6 @@
#include <svx/polypolygoneditor.hxx>
#include <svx/xlntrit.hxx>
#include <vcl/salbtype.hxx> // FRound
-#include "svdoimp.hxx"
#include <svx/sdr/contact/viewcontactofsdrpathobj.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 24bbe48..818e034 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -51,7 +51,6 @@
#include <svx/xflclit.hxx>
#include <svx/xlnclit.hxx>
#include <svx/xlnwtit.hxx>
-#include "svdoimp.hxx"
#include <svx/sdr/properties/rectangleproperties.hxx>
#include <svx/sdr/contact/viewcontactofsdrrectobj.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
commit b799de7bd2b0b6745ca877d744c47faa404829c5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 01:10:16 2011 +0100
callcatcher: remove unused DecryptBlockName_Imp
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index bc8a8bf..5108c03 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -109,7 +109,6 @@ static const sal_Char
static const sal_Char sImplWordChars[] = "-'";
void EncryptBlockName_Imp( String& rName );
-void DecryptBlockName_Imp( String& rName );
// FileVersions Number for the Substitution-/Exception list separately
@@ -1737,25 +1736,6 @@ void GeneratePackageName ( const String& rShort, String& rPackageName )
}
}
-void DecryptBlockName_Imp( String& rName )
-{
- if( '#' == rName.GetChar( 0 ) )
- {
- rName.Erase( 0, 1 );
- sal_Unicode* pName = rName.GetBufferAccess();
- xub_StrLen nLen, nPos;
- for ( nLen = rName.Len(), nPos = 0; nPos < nLen; ++nPos, ++pName )
- switch( *pName )
- {
- case 0x01: *pName = '!'; break;
- case 0x0A: *pName = ':'; break;
- case 0x0C: *pName = '\\'; break;
- case 0x0E: *pName = '.'; break;
- case 0x0F: *pName = '/'; break;
- }
- }
-}
-
const SvxAutocorrWord* lcl_SearchWordsInList(
SvxAutoCorrectLanguageListsPtr pList, const String& rTxt,
xub_StrLen& rStt, xub_StrLen nEndPos, SvxAutoCorrDoc& )
commit ac7c288239839a1ad0b57a03d6fa4635098bb4d6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 01:07:34 2011 +0100
callcatcher: remove unused CmpUS_Impl
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index bcf0f85..aade9f7 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1360,19 +1360,6 @@ void SfxBindings::UpdateSlotServer_Impl()
//--------------------------------------------------------------------
-int SAL_CALL CmpUS_Impl(const void *p1, const void *p2)
-
-/* [Description]
-
- Internal Comparison function for qsort.
-*/
-
-{
- return *(sal_uInt16 *)p1 - *(sal_uInt16 *)p2;
-}
-
-//--------------------------------------------------------------------
-
SfxItemSet* SfxBindings::CreateSet_Impl
(
SfxStateCache*& pCache, // in: Status-Cache from nId
commit 36428b8b0d92b8eafb7a2db61c02337fe5867ca1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 01:05:02 2011 +0100
callcatcher: remove MapCommandGroupToGroupID
diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx
index 56536f0..38adfe7 100644
--- a/sfx2/inc/sfx2/sfxbasecontroller.hxx
+++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx
@@ -88,7 +88,6 @@ struct IMPL_SfxBaseController_DataContainer ; // impl. struct to hold member of
class SfxViewFrame;
sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID );
-sal_Int16 MapCommandGroupToGroupID( sal_Int16 nCommandGroup );
//________________________________________________________________________________________________________
// class declarations
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index c75f94f..3295fa8 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -204,19 +204,6 @@ sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID )
return com::sun::star::frame::CommandGroup::INTERNAL;
}
-sal_Int16 MapCommandGroupToGroupID( sal_Int16 nCommandGroup )
-{
- sal_Int32 i = 0;
- while ( GroupIDCommandGroupMap[i].nGroupID != 0 )
- {
- if ( GroupIDCommandGroupMap[i].nCommandGroup == nCommandGroup )
- return GroupIDCommandGroupMap[i].nGroupID;
- ++i;
- }
-
- return -1;
-}
-
sal_uInt32 Get10ThSec()
{
sal_uInt32 n10Ticks = 10 * (sal_uInt32)clock();
commit f989cb4fff55205c19233fd8911b187c2715ab53
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 01:00:52 2011 +0100
remove unused QuitAgain_Impl
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 8afc98a..20cb0cb 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -145,16 +145,6 @@ using namespace ::com::sun::star::document;
namespace css = com::sun::star;
-//-------------------------------------------------------------------------
-long QuitAgain_Impl( void* pObj, void* pArg )
-{
- SfxApplication* pApp = (SfxApplication*)pObj;
- Timer* pTimer = (Timer*)pArg;
- delete pTimer;
- pApp->GetDispatcher_Impl()->Execute( SID_QUITAPP, SFX_CALLMODE_ASYNCHRON );
- return 0;
-}
-
/// Find the correct location of the document (LICENSE.odt, etc.), and return
/// it in rURL if found.
static sal_Bool checkURL( const char *pName, const char *pExt, rtl::OUString &rURL )
commit 62ebcb69fa9434f713adca0dd9ebcdec187acae9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 00:59:25 2011 +0100
callcatcher: remove unused standalone SearchAndReplace
diff --git a/sfx2/source/bastyp/misc.cxx b/sfx2/source/bastyp/misc.cxx
index 599097b..cc8cf9a 100644
--- a/sfx2/source/bastyp/misc.cxx
+++ b/sfx2/source/bastyp/misc.cxx
@@ -39,22 +39,6 @@ unsigned SfxStack::nLevel = 0;
//--------------------------------------------------------------------
-String SearchAndReplace( const String &rSource,
- const String &rToReplace,
- const String &rReplacement )
-{
- String aTarget( rSource );
- sal_uInt16 nPos = rSource.Search( rToReplace );
- if ( nPos != STRING_NOTFOUND )
- {
- aTarget.Erase( nPos, rToReplace.Len() );
- return aTarget.Insert( rReplacement, nPos );
- }
- return rSource;
-}
-
-//--------------------------------------------------------------------
-
String SfxStringEncode( const String &rSource, const char * )
{
String aRet;
commit b71991cea3525d2196db528c45a4b2e65fa9b33e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 00:57:58 2011 +0100
callcatcher: remove unused SfxShellIdent_Impl
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index a9eeffc..09cdf4a 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -93,31 +93,6 @@ struct SfxShell_Impl: public SfxBroadcaster
~SfxShell_Impl() { delete pExecuter; delete pUpdater;}
};
-//====================================================================
-#ifdef DBG_UTIL
-
-String SfxShellIdent_Impl( const SfxShell *pSh )
-
-/* [Description]
-
- Internal helper function. Returns a SfxShell 'pSh' descriptive string.
- For instance: SfxApplication [StarWriter]
-*/
-
-{
- String aIdent( pSh->ISA(SfxApplication) ? DEFINE_CONST_UNICODE("SfxApplication") :
- pSh->ISA(SfxViewFrame) ? DEFINE_CONST_UNICODE("SfxViewFrame") :
- pSh->ISA(SfxViewShell) ? DEFINE_CONST_UNICODE("SfxViewShell") :
- pSh->ISA(SfxObjectShell) ? DEFINE_CONST_UNICODE("SfxObjectShell") : DEFINE_CONST_UNICODE("SfxShell") );
- aIdent += '[';
- aIdent += pSh->GetName();
- aIdent += ']';
- return aIdent;
-}
-
-#endif
-//====================================================================
-
//=========================================================================
// SfxShell
//=========================================================================
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 52a8157..d6cd39f 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -100,10 +100,6 @@ struct _Capper
//------------------------------------------------------------------------
-String SfxShellIdent_Impl( const SfxShell *pSh );
-
-//------------------------------------------------------------------------
-
#if defined(DBG_UTIL) && defined(WNT)
class SfxStack
commit 80c41cd100a722536e0dcf4ce3e3a70b6eb02b72
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 00:55:10 2011 +0100
remove unused polypolygon variants
diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx
index 568212a..d4f3131 100644
--- a/svx/inc/svx/svdtrans.hxx
+++ b/svx/inc/svx/svdtrans.hxx
@@ -92,8 +92,6 @@ void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2);
inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear = false);
SVX_DLLPUBLIC void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, bool bVShear = false);
void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear = false);
-void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear = false);
-void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear = false);
// rPnt.X bzw rPnt.Y wird auf rCenter.X bzw. rCenter.Y gesetzt!
// anschliessend muss rPnt nur noch um rCenter gedreht werden.
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index f1b3881..172d21d 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -250,24 +250,6 @@ void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear)
}
}
-void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear)
-{
- sal_uInt16 nAnz=rPoly.Count();
- for (sal_uInt16 i=0; i<nAnz; i++) {
- ShearPoly(rPoly[i],rRef,tn,bVShear);
- }
-}
-
-void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear)
-{
- sal_uInt16 nAnz=rPoly.Count();
- for (sal_uInt16 i=0; i<nAnz; i++) {
- ShearXPoly(rPoly[i],rRef,tn,bVShear);
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter,
const Point& rRad, double& rSin, double& rCos, bool bVert)
{
commit e2f751f5119ea532aecfe619dc81ccccf7470c23
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 00:43:08 2011 +0100
callcatcher: remove unused implFoo*
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 8f0a394..f9e6ca7 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -480,15 +480,6 @@ sal_Bool hasUno( void );
// (Implemented in methods.cxx)
String getFullPath( const String& aRelPath );
-// Sets (virtual) current path for UCB file access
-void implChDir( const String& aDir );
-
-// Sets (virtual) current drive for UCB file access
-void implChDrive( const String& aDrive );
-
-// Returns (virtual) current path for UCB file access
-String implGetCurDir( void );
-
// Implementation of StepRENAME with UCB
// (Implemented in methods.cxx, so step0.cxx
// has not to be infected with UNO)
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 60db580..25670dd 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -184,28 +184,6 @@ String getFullPath( const String& aRelPath )
return aFileURL;
}
-// Sets (virtual) current path for UCB file access
-void implChDir( const String& aDir )
-{
- (void)aDir;
- // TODO
-}
-
-// Sets (virtual) current drive for UCB file access
-void implChDrive( const String& aDrive )
-{
- (void)aDrive;
- // TODO
-}
-
-// Returns (virtual) current path for UCB file access
-String implGetCurDir( void )
-{
- String aRetStr;
-
- return aRetStr;
-}
-
// TODO: -> SbiGlobals
static com::sun::star::uno::Reference< XSimpleFileAccess3 > getFileAccess( void )
{
commit cf928ea9f683711faafaf383a37cf51ece0d4679
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 00:41:02 2011 +0100
callcatcher: unused lcl_Foo methods
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 3e0cc20..7e23e18 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -76,25 +76,6 @@ static const sal_uInt16 nDefBulletWidth = 700;
static const sal_uInt16 pDefBulletIndents[nDefStyles]= { 1400, 800, 800 };
static const sal_uInt16 pDefBulletWidths[nDefStyles] = { 1000, 850, 700 };
-sal_uInt16 lcl_ImplGetDefBulletWidth( sal_Int16 nDepth )
-{
- return ( nDepth < nDefStyles ) ? pDefBulletWidths[nDepth] : nDefBulletWidth;
-}
-
-sal_uInt16 lcl_ImplGetDefBulletIndent( sal_Int16 nDepth )
-{
- sal_uInt16 nI = 0;
-
- if( nDepth >= 0 )
- {
- for ( sal_Int16 n = 0; n <= nDepth; n++ )
- nI = nI +
- ( ( n < nDefStyles ) ? pDefBulletIndents[n] : nDefBulletIndent );
- }
- return nI;
-}
-
-
// ----------------------------------------------------------------------
// Outliner
// ----------------------------------------------------------------------
commit 0a81d7a363c475b790fa22803af0c525a6646556
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 00:40:16 2011 +0100
callcatcher: unused lcl_FontChangedHint
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 488ef01..4cec5f9 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -111,7 +111,6 @@
void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet );
void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize );
-sal_Bool lcl_FontChangedHint( const SfxHint &rHint );
// namespaces
using ::rtl::OUString;
@@ -2628,23 +2627,6 @@ void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemS
rWin.SetOutputSizePixel( aSize );
}
-// -----------------------------------------------------------------------
-
-sal_Bool lcl_FontChangedHint( const SfxHint &rHint )
-{
- SfxPoolItemHint *pItemHint = PTR_CAST(SfxPoolItemHint, &rHint);
- if ( pItemHint )
- {
- SfxPoolItem *pItem = pItemHint->GetObject();
- return ( pItem->Which() == SID_ATTR_CHAR_FONTLIST );
- }
- else
- {
- SfxSimpleHint* pSimpleHint = PTR_CAST(SfxSimpleHint, &rHint);
- return pSimpleHint && ( SFX_HINT_DATACHANGED ==
- ( pSimpleHint->GetId() & SFX_HINT_DATACHANGED ) );
- }
-}
// -----------------------------------------------------------------------------
Reference< ::com::sun::star::accessibility::XAccessible > SvxFontNameBox_Impl::CreateAccessible()
{
commit 6a86667cdcfee8a4b7272c90bad6dc9995f27939
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 00:39:30 2011 +0100
callcatcher: unused lcl_CreateBulletItem
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 91db40a..c0555cc 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -59,87 +59,6 @@ DBG_NAME( XEditAttribute )
//--------------------------------------------------------------
-sal_Bool lcl_CreateBulletItem( const SvxNumBulletItem& rNumBullet, sal_uInt16 nLevel, SvxBulletItem& rBullet )
-{
- const SvxNumberFormat* pFmt = rNumBullet.GetNumRule()->Get( nLevel );
- if ( pFmt )
- {
- rBullet.SetWidth( (-pFmt->GetFirstLineOffset()) + pFmt->GetCharTextDistance() );
- rBullet.SetSymbol( pFmt->GetBulletChar() );
- rBullet.SetPrevText( pFmt->GetPrefix() );
- rBullet.SetFollowText( pFmt->GetSuffix() );
- rBullet.SetStart( pFmt->GetStart() );
- rBullet.SetScale( pFmt->GetBulletRelSize() );
-
- Font aBulletFont( rBullet.GetFont() );
- if ( pFmt->GetBulletFont() )
- aBulletFont = *pFmt->GetBulletFont();
- aBulletFont.SetColor( pFmt->GetBulletColor() );
- rBullet.SetFont( aBulletFont );
-
- if ( pFmt->GetBrush() && pFmt->GetBrush()->GetGraphic() )
- {
- Bitmap aBmp( pFmt->GetBrush()->GetGraphic()->GetBitmap() );
- aBmp.SetPrefSize( pFmt->GetGraphicSize() );
- aBmp.SetPrefMapMode( MAP_100TH_MM );
- rBullet.SetBitmap( aBmp );
- }
-
- switch ( pFmt->GetNumberingType() )
- {
- case SVX_NUM_CHARS_UPPER_LETTER:
- case SVX_NUM_CHARS_UPPER_LETTER_N:
- rBullet.SetStyle( BS_ABC_BIG );
- break;
- case SVX_NUM_CHARS_LOWER_LETTER:
- case SVX_NUM_CHARS_LOWER_LETTER_N:
- rBullet.SetStyle( BS_ABC_SMALL );
- break;
- case SVX_NUM_ROMAN_UPPER:
- rBullet.SetStyle( BS_ROMAN_BIG );
- break;
- case SVX_NUM_ROMAN_LOWER:
- rBullet.SetStyle( BS_ROMAN_SMALL );
- break;
- case SVX_NUM_ARABIC:
- rBullet.SetStyle( BS_123 );
- break;
- case SVX_NUM_NUMBER_NONE:
- rBullet.SetStyle( BS_NONE );
- break;
- case SVX_NUM_CHAR_SPECIAL:
- rBullet.SetStyle( BS_BULLET );
- break;
- case SVX_NUM_PAGEDESC:
- OSL_FAIL( "Unknown: SVX_NUM_PAGEDESC" );
- rBullet.SetStyle( BS_BULLET );
- break;
- case SVX_NUM_BITMAP:
- rBullet.SetStyle( BS_BMP );
- break;
- default:
- OSL_FAIL( "Unknown NumType" );
- }
-
- switch ( pFmt->GetNumAdjust() )
- {
- case SVX_ADJUST_LEFT:
- rBullet.SetJustification( BJ_VCENTER|BJ_HLEFT );
- break;
- case SVX_ADJUST_RIGHT:
- rBullet.SetJustification( BJ_VCENTER|BJ_HRIGHT );
- break;
- case SVX_ADJUST_CENTER:
- rBullet.SetJustification( BJ_VCENTER|BJ_HCENTER );
- break;
- default:
- OSL_FAIL( "Unknown or invalid NumAdjust" );
- }
- }
- return pFmt ? sal_True : sal_False;
-}
-
-
XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem, sal_uInt16 nStart, sal_uInt16 nEnd )
{
// Create thw new attribute in the pool
commit 4947dea44de3ba32ec6076976cca72d7227a43aa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 00:38:21 2011 +0100
callcatcher: unused lcl_IsUnsupportedUnicodeChar
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index d35f566..bc8a8bf 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -143,35 +143,6 @@ inline int IsUpperLetter( sal_Int32 nCharType )
0 == ( ::com::sun::star::i18n::KCharacterType::LOWER & nCharType);
}
-bool lcl_IsUnsupportedUnicodeChar( CharClass& rCC, const String& rTxt,
- xub_StrLen nStt, xub_StrLen nEnd )
-{
- for( ; nStt < nEnd; ++nStt )
- {
- short nScript = rCC.getScript( rTxt, nStt );
- switch( nScript )
- {
- case ::com::sun::star::i18n::UnicodeScript_kCJKRadicalsSupplement:
- case ::com::sun::star::i18n::UnicodeScript_kHangulJamo:
- case ::com::sun::star::i18n::UnicodeScript_kCJKSymbolPunctuation:
- case ::com::sun::star::i18n::UnicodeScript_kHiragana:
- case ::com::sun::star::i18n::UnicodeScript_kKatakana:
- case ::com::sun::star::i18n::UnicodeScript_kHangulCompatibilityJamo:
- case ::com::sun::star::i18n::UnicodeScript_kEnclosedCJKLetterMonth:
- case ::com::sun::star::i18n::UnicodeScript_kCJKCompatibility:
- case ::com::sun::star::i18n::UnicodeScript_k_CJKUnifiedIdeographsExtensionA:
- case ::com::sun::star::i18n::UnicodeScript_kCJKUnifiedIdeograph:
- case ::com::sun::star::i18n::UnicodeScript_kHangulSyllable:
- case ::com::sun::star::i18n::UnicodeScript_kCJKCompatibilityIdeograph:
- case ::com::sun::star::i18n::UnicodeScript_kHalfwidthFullwidthForm:
- return true;
- default: ; //do nothing
- }
-
- }
- return false;
-}
-
sal_Bool lcl_IsSymbolChar( CharClass& rCC, const String& rTxt,
xub_StrLen nStt, xub_StrLen nEnd )
{
commit 37a5b1b0460a49b5035a44b75eb032eb97c474fb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 00:37:43 2011 +0100
callcatcher: unused lcl_MoveBox
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index dc31f76..9500920 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -772,19 +772,6 @@ void SvxRubyDialog::DataChanged( const DataChangedEvent& rDCEvt )
UpdateColors();
}
-void lcl_MoveBox(long nOffset, Edit& rLeft, Edit& rRight)
-{
- Size aLeftSz(rLeft.GetSizePixel());
- Point aRightPos(rRight.GetPosPixel());
- Size aRightSz(rRight.GetSizePixel());
- aLeftSz.Width() += nOffset;
- aRightSz.Width() -= nOffset;
- aRightPos.X() += nOffset;
- rLeft.SetSizePixel(aLeftSz);
- rRight.SetPosSizePixel(aRightPos, aRightSz);
-
-}
-
RubyPreview::RubyPreview(SvxRubyDialog& rParent, const ResId& rResId) :
Window(&rParent, rResId),
rParentDlg(rParent)
commit 88a9dad02a4449b5d7a90a23a70fc2dea0663007
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 00:24:47 2011 +0100
callcatcher: remove unused AddNumber_Impl
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 1d4c462..625440d 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -59,22 +59,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::task;
-void AddNumber_Impl( String& aNumber, sal_uInt32 nArg )
-{
- if ( nArg >= 10240 )
- {
- aNumber += String::CreateFromInt32( (sal_uInt16)( ( nArg + 512 ) / 1024 ) );
- aNumber += ' ';
- aNumber += SfxResId( STR_KB );
- }
- else
- {
- aNumber += String::CreateFromInt32( nArg );
- aNumber += ' ';
- aNumber += SfxResId( STR_BYTES );
- }
-}
-
struct SfxProgress_Impl
{
Reference < XStatusIndicator > xStatusInd;
commit 95d23c6c93990f534a4f056af725f0314e690e24
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 00:07:15 2011 +0100
callcatcher: remove unused SupportsCommandGroup
diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx
index bf84790..56536f0 100644
--- a/sfx2/inc/sfx2/sfxbasecontroller.hxx
+++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx
@@ -88,7 +88,6 @@ struct IMPL_SfxBaseController_DataContainer ; // impl. struct to hold member of
class SfxViewFrame;
sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID );
-sal_Bool SupportsCommandGroup( sal_Int16 nCommandGroup );
sal_Int16 MapCommandGroupToGroupID( sal_Int16 nCommandGroup );
//________________________________________________________________________________________________________
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index c99960f..c75f94f 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -217,14 +217,6 @@ sal_Int16 MapCommandGroupToGroupID( sal_Int16 nCommandGroup )
return -1;
}
-sal_Bool SupportsCommandGroup( sal_Int16 nCommandGroup )
-{
- if (( nCommandGroup >= 0 ) && ( nCommandGroup <= MAX_COMMANDGROUP ))
- return sal_True;
- else
- return sal_False;
-}
-
sal_uInt32 Get10ThSec()
{
sal_uInt32 n10Ticks = 10 * (sal_uInt32)clock();
commit 821738d39367342223f45ffaa97c4b0ff9d70460
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jul 9 23:59:23 2011 +0100
callcatcher: unused getScriptLibraryContainer
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index 0c413a3..4751091 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -193,7 +193,6 @@ public:
inline css::uno::Reference< css::frame::XModel > getDocOwner() { return _xDoc; }
- css::uno::Reference< css::script::XLibraryContainer > getScriptLibraryContainer();
// XRoot
virtual void SAL_CALL startDocument(
css::uno::Reference< css::xml::input::XNamespaceMapping >
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index b5d61fd..7f1f90e 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -2027,28 +2027,7 @@ Reference< xml::input::XElement > DialogImport::getStyle(
}
return 0;
}
-//__________________________________________________________________________________________________
-Reference< script::XLibraryContainer > DialogImport::getScriptLibraryContainer()
-{
- if( !_xScriptLibraryContainer.is() )
- {
- try
- {
- Reference< beans::XPropertySet > xProps( _xDoc, UNO_QUERY );
- if( xProps.is() )
- _xScriptLibraryContainer.set( xProps->getPropertyValue( OUSTR("BasicLibraries") ), UNO_QUERY );
- }
- catch( const Exception& )
- {
- }
- }
-
- return _xScriptLibraryContainer;
-}
-//##################################################################################################
-
-//==================================================================================================
Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel(
Reference< container::XNameContainer > const & xDialogModel,
Reference< XComponentContext > const & xContext,
commit e259baa1cfe2823bb3c3e1dee5a30f47b80d6000
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jul 9 23:57:18 2011 +0100
callcatcher: unused lcl_hasChartType
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 55ae80a..fc15cb0 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -563,30 +563,6 @@ sal_Int32 lcl_getSequenceLengthByRole(
return 0;
}
-bool lcl_hasChartType( const Reference< chart2::XDiagram > & xDiagram, const OUString & rChartType )
-{
- try
- {
- Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY_THROW );
- Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems());
- for( sal_Int32 nCooSysIdx=0; nCooSysIdx<aCooSysSeq.getLength(); ++nCooSysIdx )
- {
- Reference< chart2::XChartTypeContainer > xCTCnt( aCooSysSeq[nCooSysIdx], uno::UNO_QUERY_THROW );
- Sequence< Reference< chart2::XChartType > > aChartTypes( xCTCnt->getChartTypes());
- for( sal_Int32 nCTIdx=0; nCTIdx<aChartTypes.getLength(); ++nCTIdx )
- {
- if( aChartTypes[nCTIdx]->getChartType().equals( rChartType ))
- return true;
- }
- }
- }
- catch( uno::Exception & )
- {
- OSL_FAIL( "Exception while searching for chart type in diagram" );
- }
- return false;
-}
-
OUString lcl_flattenStringSequence( const Sequence< OUString > & rSequence )
{
OUStringBuffer aResult;
More information about the Libreoffice-commits
mailing list