[Libreoffice-commits] .: 5 commits - avmedia/inc avmedia/source desktop/source oox/inc oox/source sc/inc sc/source sd/source svtools/inc svtools/source svx/inc svx/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Apr 25 03:58:58 PDT 2012
avmedia/inc/avmedia/mediawindow.hxx | 1
avmedia/source/viewer/mediawindow.cxx | 7 -
avmedia/source/viewer/mediawindowbase_impl.cxx | 7 -
avmedia/source/viewer/mediawindowbase_impl.hxx | 1
desktop/source/deployment/registry/component/dp_component.cxx | 21 ---
oox/inc/oox/dump/dumperbase.hxx | 6
oox/source/dump/dumperbase.cxx | 7 -
sc/inc/chartlis.hxx | 1
sc/source/core/tool/chartlis.cxx | 7 -
sd/source/core/drawdoc4.cxx | 2
sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 4
sd/source/ui/animations/CustomAnimationDialog.cxx | 4
sd/source/ui/dlg/animobjs.cxx | 2
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 2
sd/source/ui/unoidl/unolayer.cxx | 6
svtools/inc/svtools/fmtfield.hxx | 24 ---
svtools/source/control/fmtfield.cxx | 69 ----------
svtools/source/edit/xtextedt.cxx | 2
svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx | 1
svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx | 7 -
unusedcode.easy | 1
21 files changed, 12 insertions(+), 170 deletions(-)
New commits:
commit bcc3e0e7e8863e4b707301349960ffb306f42f24
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 25 11:17:36 2012 +0100
callcatcher: drop unused hasPreferredSize
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
index 696eab6..ab9bae2 100644
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
@@ -83,7 +83,6 @@ namespace avmedia
const ::rtl::OUString& getURL() const;
bool isValid() const;
- bool hasPreferredSize() const;
Size getPreferredSize() const;
Window* getWindow() const;
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index e6c6c06..7861d0d 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -148,13 +148,6 @@ void MediaWindow::StartDrag( sal_Int8 /* nAction */, const Point& /* rPosPixel *
// -------------------------------------------------------------------------
-bool MediaWindow::hasPreferredSize() const
-{
- return( mpImpl != NULL && mpImpl->hasPreferredSize() );
-}
-
-// -------------------------------------------------------------------------
-
Size MediaWindow::getPreferredSize() const
{
return mpImpl->getPreferredSize();
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index b60a835..bea04e6 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -217,13 +217,6 @@ void MediaWindowBaseImpl::cleanUp()
// ---------------------------------------------------------------------
-bool MediaWindowBaseImpl::hasPreferredSize() const
-{
- return( mxPlayerWindow.is() );
-}
-
-// ---------------------------------------------------------------------
-
Size MediaWindowBaseImpl::getPreferredSize() const
{
Size aRet;
diff --git a/avmedia/source/viewer/mediawindowbase_impl.hxx b/avmedia/source/viewer/mediawindowbase_impl.hxx
index afd68e4..683e6e2 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.hxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.hxx
@@ -72,7 +72,6 @@ namespace avmedia
bool isValid() const;
- bool hasPreferredSize() const;
Size getPreferredSize() const;
bool setZoom( ::com::sun::star::media::ZoomLevel eLevel );
commit 4efd419679e9a43b47bfe970fc5b1c2d7c680890
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 25 00:05:58 2012 +0100
after nine years, time to give up on the REGEXP_SUPPORT dream
diff --git a/svtools/inc/svtools/fmtfield.hxx b/svtools/inc/svtools/fmtfield.hxx
index fdbf251..d4fd75a 100644
--- a/svtools/inc/svtools/fmtfield.hxx
+++ b/svtools/inc/svtools/fmtfield.hxx
@@ -33,17 +33,7 @@
#include <vcl/spinfld.hxx>
#include <svl/zforlist.hxx>
-//#define REGEXP_SUPPORT
-
-#ifdef REGEXP_SUPPORT
- #ifndef _UNOTOOLS_TEXTSEARCH_HXX
- #include <unotools/textsearch.hxx>
- #endif
-#else
- // use a hand-made regular expression parsing for the small expression we're interested in
- // as soon as OOo does have regular expression support, we can switch on the REGEXP_SUPPORT define
- namespace validation { class NumberValidator; }
-#endif
+namespace validation { class NumberValidator; }
typedef sal_uInt16 FORMAT_CHANGE_TYPE;
#define FCT_KEYONLY 0x00 // only a new key was set
@@ -282,31 +272,19 @@ protected:
class SVT_DLLPUBLIC DoubleNumericField : public FormattedField
{
protected:
-#ifdef REGEXP_SUPPORT
- ::utl::TextSearch* m_pConformanceTester;
-#else
validation::NumberValidator* m_pNumberValidator;
-#endif
public:
DoubleNumericField(Window* pParent, WinBits nStyle = 0)
:FormattedField(pParent, nStyle)
-#ifdef REGEXP_SUPPORT
- ,m_pConformanceTester( NULL )
-#else
,m_pNumberValidator( NULL )
-#endif
{
ResetConformanceTester();
}
DoubleNumericField(Window* pParent, const ResId& rResId)
:FormattedField(pParent, rResId)
-#ifdef REGEXP_SUPPORT
- ,m_pConformanceTester( NULL )
-#else
,m_pNumberValidator( NULL )
-#endif
{
ResetConformanceTester();
}
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 237d63c..9854561 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -42,30 +42,12 @@
#include <com/sun/star/util/SearchResult.hpp>
#include <com/sun/star/util/SearchFlags.hpp>
#include <unotools/syslocale.hxx>
-
-#ifndef REGEXP_SUPPORT
#include <map>
-#endif
-
-#if !defined INCLUDED_RTL_MATH_HXX
#include <rtl/math.hxx>
-#endif
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
-
-#ifdef REGEXP_SUPPORT
-
-//==============================================================================
-// regular expression to validate complete numbers, plus every fragment which can occur during the input
-// of a complete number
-// [+/-][{digit}*.]*{digit}*[,{digit}*][e[+/-]{digit}*]
-const char szNumericInput[] = "_[-+]?([0-9]*\\,)*[0-9]*(\\.[0-9]*)?(e[-+]?[0-9]*)?_";
- // (the two _ are for normalizing it: With this, we can ensure that a to-be-checked text is always
- // matched as a _whole_)
-#else
-
// hmm. No support for regular expression. Well, I always (not really :) wanted to write a finite automat
// so here comes a finite automat ...
@@ -300,8 +282,6 @@ namespace validation
}
}
-#endif
-
//==============================================================================
SvNumberFormatter* FormattedField::StaticFormatter::s_cFormatter = NULL;
sal_uLong FormattedField::StaticFormatter::s_nReferences = 0;
@@ -1135,11 +1115,7 @@ bool FormattedField::IsUsingInputStringForFormatting() const
//------------------------------------------------------------------------------
DoubleNumericField::~DoubleNumericField()
{
-#ifdef REGEXP_SUPPORT
- delete m_pConformanceTester;
-#else
delete m_pNumberValidator;
-#endif
}
//------------------------------------------------------------------------------
@@ -1155,25 +1131,7 @@ sal_Bool DoubleNumericField::CheckText(const XubString& sText) const
// We'd like to implement this using the NumberFormatter::IsNumberFormat, but unfortunately, this doesn't
// recognize fragments of numbers (like, for instance "1e", which happens during entering e.g. "1e10")
// Thus, the roundabout way via a regular expression
-
-#ifdef REGEXP_SUPPORT
- if (!sText.Len())
- return sal_True;
-
- String sForceComplete = '_';
- sForceComplete += sText;
- sForceComplete += '_';
-
- sal_uInt16 nStart = 0, nEnd = sForceComplete.Len();
- sal_Bool bFound = m_pConformanceTester->SearchFrwrd(sForceComplete, &nStart, &nEnd);
-
- if (bFound && (nStart == 0) && (nEnd == sForceComplete.Len()))
- return sal_True;
-
- return sal_False;
-#else
return m_pNumberValidator->isValidNumericFragment( sText );
-#endif
}
//------------------------------------------------------------------------------
@@ -1199,35 +1157,8 @@ void DoubleNumericField::ResetConformanceTester()
cSeparatorDecimal = sSeparator.GetBuffer()[0];
}
-#ifdef REGEXP_SUPPORT
- String sDescription = String::CreateFromAscii(szNumericInput);
-
- String sReplaceWith((sal_Unicode)'\\');
- sReplaceWith += cSeparatorThousand;
- sDescription.SearchAndReplaceAscii("\\,", sReplaceWith);
-
- sReplaceWith = (sal_Unicode)'\\';
- sReplaceWith += cSeparatorDecimal;
- sDescription.SearchAndReplaceAscii("\\.", sReplaceWith);
-
- delete m_pConformanceTester;
-
- SearchOptions aParam;
- aParam.algorithmType = SearchAlgorithms_REGEXP;
- aParam.searchFlag = SearchFlags::ALL_IGNORE_CASE;
- aParam.searchString = sDescription;
- aParam.transliterateFlags = 0;
-
- String sLanguage, sCountry;
- ConvertLanguageToIsoNames( pFormatEntry ? pFormatEntry->GetLanguage() : LANGUAGE_ENGLISH_US, sLanguage, sCountry );
- aParam.Locale.Language = sLanguage;
- aParam.Locale.Country = sCountry;
-
- m_pConformanceTester = new ::utl::TextSearch(aParam);
-#else
delete m_pNumberValidator;
m_pNumberValidator = new validation::NumberValidator( cSeparatorThousand, cSeparatorDecimal );
-#endif
}
commit 7d8cc784403f857f652e4579f28a2c0d478610c2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 24 23:59:06 2012 +0100
drop a String::CreateFromAscii
diff --git a/svtools/source/edit/xtextedt.cxx b/svtools/source/edit/xtextedt.cxx
index 60aa25f..a02f6aa 100644
--- a/svtools/source/edit/xtextedt.cxx
+++ b/svtools/source/edit/xtextedt.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star;
// -------------------------------------------------------------------------
// class ExtTextEngine
// -------------------------------------------------------------------------
-ExtTextEngine::ExtTextEngine() : maGroupChars( String::CreateFromAscii( "(){}[]", 6 ) )
+ExtTextEngine::ExtTextEngine() : maGroupChars(rtl::OUString("(){}[]"))
{
}
commit fe502c893e9d26945b9bba3d921a88b16fa0ef8f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 24 23:53:16 2012 +0100
String::CreateFromInt32->rtl::OUString::valueOf
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index b8489bc..6fce9ca 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1137,7 +1137,7 @@ String SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const
aPageNumValue += sal_Unicode(' ');
break;
default:
- aPageNumValue += String::CreateFromInt32( (sal_Int32)nNum );
+ aPageNumValue += rtl::OUString::valueOf(static_cast<sal_Int32>(nNum));
}
return(aPageNumValue);
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 542411e..1f8698e 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -664,7 +664,7 @@ Window * lcl_GetTopmostParent( Window * pWindow )
void CustomAnimationCreateDialog::setPosition()
{
SvtViewOptions aDlgOpt(
- E_TABDIALOG, String::CreateFromInt32( DLG_CUSTOMANIMATION_CREATE ) );
+ E_TABDIALOG, rtl::OUString::valueOf(static_cast<sal_Int32>(DLG_CUSTOMANIMATION_CREATE)));
if ( aDlgOpt.Exists() )
{
SetWindowState( rtl::OUStringToOString(aDlgOpt.GetWindowState(),
@@ -692,7 +692,7 @@ void CustomAnimationCreateDialog::storePosition()
{
// save settings (screen position and current page)
SvtViewOptions aDlgOpt(
- E_TABDIALOG, String::CreateFromInt32( DLG_CUSTOMANIMATION_CREATE ) );
+ E_TABDIALOG, rtl::OUString::valueOf(static_cast<sal_Int32>(DLG_CUSTOMANIMATION_CREATE)));
aDlgOpt.SetWindowState(OStringToOUString(
GetWindowState(WINDOWSTATE_MASK_POS), RTL_TEXTENCODING_ASCII_US));
}
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index a8ad199..049fa9f 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -574,9 +574,9 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window
mpMetric->SetMax( 100 );
mpMenu = new PopupMenu();
- for( sal_uInt16 i = 25; i < 101; i += 25 )
+ for( sal_Int32 i = 25; i < 101; i += 25 )
{
- String aStr( String::CreateFromInt32( i ) );
+ String aStr(rtl::OUString::valueOf(i));
aStr += sal_Unicode('%');
mpMenu->InsertItem( i, aStr );
}
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index f4dd340..be53af6 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -611,7 +611,7 @@ void AnimationWindow::UpdateControl( sal_uLong nListPos, sal_Bool bDisableCtrls
aCtlDisplay.Invalidate();
aCtlDisplay.Update();
- aFiCount.SetText( UniString::CreateFromInt32( aBmpExList.Count() ) );
+ aFiCount.SetText(rtl::OUString::valueOf(static_cast<sal_Int32>(aBmpExList.Count())));
if( pBitmapEx && !bMovie )
{
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index 2cd8f70..5cb1536 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -331,7 +331,7 @@ void PageObjectPainter::PaintPageNumber (
// Paint the page number.
OSL_ASSERT(rpDescriptor->GetPage()!=NULL);
const sal_Int32 nPageNumber ((rpDescriptor->GetPage()->GetPageNum() - 1) / 2 + 1);
- const String sPageNumber (String::CreateFromInt32(nPageNumber));
+ const rtl::OUString sPageNumber(rtl::OUString::valueOf(nPageNumber));
rDevice.SetFont(*mpPageNumberFont);
rDevice.SetTextColor(aPageNumberColor);
rDevice.DrawText(aBox, sPageNumber, TEXT_DRAW_RIGHT | TEXT_DRAW_VCENTER);
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 125e2f4..2407088 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -534,15 +534,15 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal
{
SdrLayerAdmin& rLayerAdmin = mpModel->mpDoc->GetLayerAdmin();
sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount();
- sal_uInt16 nLayer = nLayerCnt - 2 + 1;
+ sal_Int32 nLayer = nLayerCnt - 2 + 1;
String aLayerName;
// Ueberpruefung auf schon vorhandene Namen
while( aLayerName.Len()==0 || rLayerAdmin.GetLayer( aLayerName, sal_False) )
{
aLayerName = String(SdResId(STR_LAYER));
- aLayerName += String::CreateFromInt32( (sal_Int32)nLayer );
- nLayer++;
+ aLayerName += rtl::OUString::valueOf(nLayer);
+ ++nLayer;
}
SdrLayerAdmin& rLA=mpModel->mpDoc->GetLayerAdmin();
commit c797a11a4d7ca7531eeb7efd85670711a08f8b4b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 24 20:59:22 2012 +0100
callcatcher: remove freshly unused code
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 6d5fb61..fa871d5 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -341,10 +341,6 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
Reference<XCommandEnvironment> const & xCmdEnv );
bool hasInUnoRc( RcItem kind, OUString const & url );
- css::uno::Reference< css::registry::XRegistryKey > openRegistryKey(
- css::uno::Reference< css::registry::XRegistryKey > const & base,
- rtl::OUString const & path);
-
css::uno::Reference< css::uno::XComponentContext > getRootContext() const;
public:
@@ -1147,23 +1143,6 @@ bool BackendImpl::hasInUnoRc(
return ::std::find( rSet.begin(), rSet.end(), rcterm ) != rSet.end();
}
-css::uno::Reference< css::registry::XRegistryKey > BackendImpl::openRegistryKey(
- css::uno::Reference< css::registry::XRegistryKey > const & base,
- rtl::OUString const & path)
-{
- OSL_ASSERT(base.is());
- css::uno::Reference< css::registry::XRegistryKey > key(base->openKey(path));
- if (!key.is()) {
- throw css::deployment::DeploymentException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("missing registry entry ")) +
- path + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" under ")) +
- base->getKeyName()),
- static_cast< OWeakObject * >(this), Any());
- }
- return key;
-}
-
css::uno::Reference< css::uno::XComponentContext > BackendImpl::getRootContext()
const
{
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index d630c97..f7d642a 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -1780,12 +1780,6 @@ protected:
const BinaryInputStreamRef& rxRecStrm,
const String& rRecNames,
const String& rSimpleRecs = EMPTY_STRING );
- void construct(
- const OutputObjectBase& rParent,
- const BinaryInputStreamRef& rxBaseStrm,
- const BinaryInputStreamRef& rxRecStrm,
- const String& rRecNames,
- const String& rSimpleRecs = EMPTY_STRING );
inline sal_Int64 getRecPos() const { return mnRecPos; }
inline sal_Int64 getRecId() const { return mnRecId; }
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 78acc50..093d8c1 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -2553,13 +2553,6 @@ void RecordObjectBase::construct( const ObjectBase& rParent,
constructRecObjBase( rxBaseStrm, rRecNames, rSimpleRecs );
}
-void RecordObjectBase::construct( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxBaseStrm,
- const BinaryInputStreamRef& rxRecStrm, const String& rRecNames, const String& rSimpleRecs )
-{
- InputObjectBase::construct( rParent, rxRecStrm );
- constructRecObjBase( rxBaseStrm, rRecNames, rSimpleRecs );
-}
-
bool RecordObjectBase::implIsValid() const
{
return mxBaseStrm.get() && InputObjectBase::implIsValid();
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 2c7a0b7..8ca2760 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -112,7 +112,6 @@ public:
void Update();
ScRangeListRef GetRangeList() const;
void SetRangeList( const ScRangeListRef& rNew );
- void SetRangeList( const ScRange& rNew );
bool IsUsed() const { return bUsed; }
void SetUsed( bool bFlg ) { bUsed = bFlg; }
bool IsDirty() const { return bDirty; }
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index c655eba..d49fdeb 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -273,13 +273,6 @@ void ScChartListener::SetRangeList( const ScRangeListRef& rNew )
mpTokens->swap(aTokens);
}
-void ScChartListener::SetRangeList( const ScRange& rRange )
-{
- ScTokenRef pToken;
- ScRefTokenHelper::getTokenFromRange(pToken, rRange);
- mpTokens->push_back(pToken);
-}
-
namespace {
class StartEndListening : public unary_function<ScTokenRef, void>
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
index 86a96ca..79c0ec0 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
@@ -54,7 +54,6 @@ namespace sdr
Window* getWindow() const;
- bool hasPreferredSize() const;
Size getPreferredSize() const;
void updateMediaItem( ::avmedia::MediaItem& rItem ) const;
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index 9ed5ddd..ab16907 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -106,13 +106,6 @@ Window* ViewObjectContactOfSdrMediaObj::getWindow() const
// ------------------------------------------------------------------------------
-bool ViewObjectContactOfSdrMediaObj::hasPreferredSize() const
-{
- return( mpMediaWindow != NULL && mpMediaWindow->hasPreferredSize() );
-}
-
-// ------------------------------------------------------------------------------
-
Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const
{
Size aRet;
diff --git a/unusedcode.easy b/unusedcode.easy
index 938fcd7..e557846 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -711,7 +711,6 @@ nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges<canvas
nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
oox::PropertyMap::dump(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>)
-oox::dump::RecordObjectBase::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&, oox::dump::BinaryInputStreamRef const&, oox::dump::String const&, oox::dump::String const&)
oox::xls::BiffGroupObject::BiffGroupObject(oox::xls::WorksheetHelper const&)
oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange const&, int)
psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&)
More information about the Libreoffice-commits
mailing list