[Libreoffice-commits] .: 5 commits - hwpfilter/source sd/source sfx2/inc sfx2/source svl/inc svl/source svx/inc svx/source sw/inc sw/qa sw/source unotools/inc unotools/source unusedcode.easy vcl/inc vcl/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Sep 9 01:23:45 PDT 2011
hwpfilter/source/fontmap.cxx | 2
sd/source/filter/eppt/epptbase.hxx | 2
sd/source/filter/eppt/epptso.cxx | 2
sd/source/filter/eppt/pptx-epptbase.cxx | 14 ++--
sd/source/filter/eppt/pptx-epptooxml.cxx | 2
sfx2/inc/sfx2/childwin.hxx | 3
sfx2/inc/sfx2/viewsh.hxx | 2
sfx2/source/appl/childwin.cxx | 8 --
sfx2/source/view/viewsh.cxx | 12 ---
svl/inc/svl/whiter.hxx | 3
svl/source/items/whiter.cxx | 34 ----------
svx/inc/svx/svdmrkv.hxx | 3
svx/inc/svx/svdovirt.hxx | 1
svx/inc/svx/svdview.hxx | 4 -
svx/inc/svx/xtable.hxx | 2
svx/source/svdraw/svdmrkv.cxx | 19 -----
svx/source/svdraw/svdmrkv1.cxx | 7 --
svx/source/svdraw/svdovirt.cxx | 9 --
svx/source/svdraw/svdview.cxx | 38 -----------
svx/source/xoutdev/xtablend.cxx | 5 -
sw/inc/swscanner.hxx | 81 ++++++++++++++++++++++++
sw/qa/core/swdoc-test.cxx | 40 +++++++++++
sw/source/core/inc/scriptinfo.hxx | 47 -------------
unotools/inc/unotools/configvaluecontainer.hxx | 18 -----
unotools/source/config/configvaluecontainer.cxx | 10 --
unusedcode.easy | 14 ----
vcl/inc/vcl/split.hxx | 1
vcl/source/window/split.cxx | 7 --
28 files changed, 138 insertions(+), 252 deletions(-)
New commits:
commit 20de64b70e885b221317cf2a021829bc575d269c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 9 09:13:49 2011 +0100
callcatcher: various unused code
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index 8fccd8c..07cbdec 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -210,7 +210,6 @@ public:
// Behavior Flags
SfxScrollingMode GetScrollingMode() const;
- void SetScrollingMode( SfxScrollingMode eMode );
// Misc
virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False );
@@ -284,7 +283,6 @@ public:
sal_Bool TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent );
- void SetAdditionalPrintOptions( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
void ExecPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool, sal_Bool );
void AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, sal_Bool );
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index ff96e69..6db3399 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1886,13 +1886,6 @@ SfxScrollingMode SfxViewShell::GetScrollingMode() const
//--------------------------------------------------------------------
-void SfxViewShell::SetScrollingMode( SfxScrollingMode eMode )
-{
- pImp->m_eScroll = eMode;
-}
-
-//--------------------------------------------------------------------
-
SfxObjectShell* SfxViewShell::GetObjectShell()
{
return pFrame ? pFrame->GetObjectShell() : NULL;
@@ -2149,11 +2142,6 @@ sal_Bool SfxViewShell::HasMouseClickListeners_Impl()
? pImp->m_pController->HasMouseClickListeners_Impl() : sal_False;
}
-void SfxViewShell::SetAdditionalPrintOptions( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rOpts )
-{
- pImp->aPrintOpts = rOpts;
-}
-
sal_Bool SfxViewShell::Escape()
{
return GetViewFrame()->GetBindings().Execute( SID_TERMINATE_INPLACEACTIVATION );
diff --git a/svl/inc/svl/whiter.hxx b/svl/inc/svl/whiter.hxx
index bb3936e..37c7301 100644
--- a/svl/inc/svl/whiter.hxx
+++ b/svl/inc/svl/whiter.hxx
@@ -52,10 +52,7 @@ public:
sal_uInt16 GetCurWhich() const { return *pRanges + nOfst; }
sal_uInt16 NextWhich();
- sal_uInt16 PrevWhich();
-
sal_uInt16 FirstWhich();
- sal_uInt16 LastWhich();
};
#endif
diff --git a/svl/source/items/whiter.cxx b/svl/source/items/whiter.cxx
index b9fb9ca..8ff8740 100644
--- a/svl/source/items/whiter.cxx
+++ b/svl/source/items/whiter.cxx
@@ -76,26 +76,6 @@ sal_uInt16 SfxWhichIter::NextWhich()
// -----------------------------------------------------------------------
-sal_uInt16 SfxWhichIter::PrevWhich()
-{
- DBG_CHKTHIS(SfxWhichIter, 0);
- while ( pRanges != pStart || 0 != nOfst )
- {
- if(nOfst)
- --nOfst;
- else {
- pRanges -= 2;
- nOfst = *(pRanges+1) - (*pRanges);
- }
- sal_uInt16 nWhich = *pRanges + nOfst;
- if ( nWhich >= nFrom && nWhich <= nTo )
- return nWhich;
- }
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
sal_uInt16 SfxWhichIter::FirstWhich()
{
DBG_CHKTHIS(SfxWhichIter, 0);
@@ -106,18 +86,4 @@ sal_uInt16 SfxWhichIter::FirstWhich()
return NextWhich();
}
-// -----------------------------------------------------------------------
-
-sal_uInt16 SfxWhichIter::LastWhich()
-{
- DBG_CHKTHIS(SfxWhichIter, 0);
- while(*pRanges)
- ++pRanges;
- nOfst = 0;
- sal_uInt16 nWhich = *(pRanges-1);
- if ( nWhich >= nFrom && nWhich <= nTo )
- return nWhich;
- return PrevWhich();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
index dd4166b..da08586 100644
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/svx/inc/svx/svdmrkv.hxx
@@ -248,8 +248,6 @@ public:
void SetFrameDragSingles(sal_Bool bOn=sal_True) { SetFrameHandles(bOn); }
sal_Bool IsFrameDragSingles() const { return IsFrameHandles(); }
- sal_Bool HasMarkableObj() const;
-
////////////////////////////////////////////////////////////////////////////////////////////////////
// migrate selections
@@ -427,7 +425,6 @@ public:
sal_Bool MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV, sal_Bool bUnmark=sal_False);
sal_Bool UnmarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,sal_True); }
sal_Bool IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const;
- sal_Bool UnmarkGluePoint(const SdrHdl& rHdl);
// Hdl eines markierten GluePoints holen. Nicht markierte
// GluePoints haben keine Handles
diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx
index 5842d00..95536ef 100644
--- a/svx/inc/svx/svdovirt.hxx
+++ b/svx/inc/svx/svdovirt.hxx
@@ -63,7 +63,6 @@ protected:
public:
TYPEINFO();
SdrVirtObj(SdrObject& rNewObj);
- SdrVirtObj(SdrObject& rNewObj, const Point& rAnchorPos);
virtual ~SdrVirtObj();
virtual SdrObject& ReferencedObj();
virtual const SdrObject& GetReferencedObj() const;
diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx
index efd51a6..36471d9 100644
--- a/svx/inc/svx/svdview.hxx
+++ b/svx/inc/svx/svdview.hxx
@@ -257,18 +257,14 @@ public:
// - Klebepunkt-Editmode
// - TextEdit
// - ... to be continued
- sal_Bool IsMarkPossible() const;
void MarkAll();
void UnmarkAll();
sal_Bool MarkNext(sal_Bool bPrev=sal_False);
sal_Bool MarkNext(const Point& rPnt, sal_Bool bPrev=sal_False);
const Rectangle& GetMarkedRect() const;
- void SetMarkedRect(const Rectangle& rRect);
virtual void DeleteMarked();
- sal_Bool IsDeleteMarkedPossible() const;
- sal_Bool IsDeletePossible() const { return IsDeleteMarkedPossible(); }
// Markieren von Objekten, Polygonpunkten oder Klebepunkten (je nach View-
// Kontext) durch Aufziehen eines Selektionsrahmens.
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index a7b313d..ff0caf8 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -297,8 +297,6 @@ public:
);
virtual ~XLineEndList();
- using XPropertyList::Replace;
- XLineEndEntry* Replace(XLineEndEntry* pEntry, long nIndex);
using XPropertyList::Remove;
XLineEndEntry* Remove(long nIndex);
using XPropertyList::Get;
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 2213da9..becc523 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -539,25 +539,6 @@ void SdrMarkView::BrkMarkGluePoints()
}
}
-sal_Bool SdrMarkView::HasMarkableObj() const
-{
- sal_uIntPtr nCount=0;
-
- SdrPageView* pPV = GetSdrPageView();
- if(pPV)
- {
- SdrObjList* pOL=pPV->GetObjList();
- sal_uIntPtr nObjAnz=pOL->GetObjCount();
- for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz && nCount==0; nObjNum++) {
- SdrObject* pObj=pOL->GetObj(nObjNum);
- if (IsObjMarkable(pObj,pPV)) {
- nCount++;
- }
- }
- }
- return nCount!=0;
-}
-
void SdrMarkView::hideMarkHandles()
{
if(!mbMarkHandlesHidden)
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index c295b5c..c9835b4 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -632,13 +632,6 @@ sal_Bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) c
return bRet;
}
-sal_Bool SdrMarkView::UnmarkGluePoint(const SdrHdl& rHdl)
-{
- if (&rHdl!=NULL && rHdl.GetKind()==HDL_GLUE && rHdl.GetObj()!=NULL) {
- return MarkGluePoint(rHdl.GetObj(),(sal_uInt16)rHdl.GetObjHdlNum(),rHdl.GetPageView(),sal_True);
- } else return sal_False;
-}
-
SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const
{
ForceUndirtyMrkPnt();
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 9e9dd91..bc51c9b 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -66,15 +66,6 @@ SdrVirtObj::SdrVirtObj(SdrObject& rNewObj):
bClosedObj=rRefObj.IsClosedObj();
}
-SdrVirtObj::SdrVirtObj(SdrObject& rNewObj, const Point& rAnchorPos):
- rRefObj(rNewObj)
-{
- aAnchor=rAnchorPos;
- bVirtObj=sal_True; // Ja, ich bin ein virtuelles Objekt
- rRefObj.AddReference(*this);
- bClosedObj=rRefObj.IsClosedObj();
-}
-
SdrVirtObj::~SdrVirtObj()
{
rRefObj.DelReference(*this);
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index b4d7725..ab194ae 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1382,26 +1382,6 @@ void SdrView::UnmarkAll()
else UnmarkAllObj();
}
-sal_Bool SdrView::IsMarkPossible() const
-{
- if(IsTextEdit())
- {
- return SdrTextObj::HasTextImpl( pTextEditOutliner );
- }
-
- if(IsGluePointEditMode())
- {
- return HasMarkableGluePoints();
- }
-
- if(HasMarkedPoints())
- {
- return HasMarkablePoints();
- }
-
- return HasMarkableObj();
-}
-
sal_Bool SdrView::MarkNext(sal_Bool bPrev)
{
if (IsTextEdit()) {
@@ -1441,15 +1421,6 @@ const Rectangle& SdrView::GetMarkedRect() const
return GetMarkedObjRect();
}
-void SdrView::SetMarkedRect(const Rectangle& rRect)
-{
- if (IsGluePointEditMode() && HasMarkedGluePoints()) {
- //SetMarkedGluePointsRect(rRect); fehlende Implementation !!!
- } else if (HasMarkedPoints()) {
- //SetMarkedPointsRect(rRect); fehlende Implementation !!!
- } else SetMarkedObjRect(rRect);
-}
-
void SdrView::DeleteMarked()
{
if (IsTextEdit())
@@ -1492,15 +1463,6 @@ sal_Bool SdrView::BegMark(const Point& rPnt, sal_Bool bAddMark, sal_Bool bUnmark
}
}
-sal_Bool SdrView::IsDeleteMarkedPossible() const
-{
- if (IsReadOnly()) return sal_False;
- if (IsTextEdit()) return sal_True;
- if (IsGluePointEditMode() && HasMarkedGluePoints()) return sal_True;
- if (HasMarkedPoints()) return sal_True;
- return IsDeleteMarkedObjPossible();
-}
-
void SdrView::ConfigurationChanged( ::utl::ConfigurationBroadcaster*p, sal_uInt32 nHint)
{
onAccessibilityOptionsChanged();
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index 40bde52..4c44920 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -157,11 +157,6 @@ XLineEndList::~XLineEndList()
impDestroy();
}
-XLineEndEntry* XLineEndList::Replace(XLineEndEntry* pEntry, long nIndex )
-{
- return (XLineEndEntry*) XPropertyList::Replace(pEntry, nIndex);
-}
-
XLineEndEntry* XLineEndList::Remove(long nIndex)
{
return (XLineEndEntry*) XPropertyList::Remove(nIndex);
diff --git a/unotools/inc/unotools/configvaluecontainer.hxx b/unotools/inc/unotools/configvaluecontainer.hxx
index ed33637..99d9ff0 100644
--- a/unotools/inc/unotools/configvaluecontainer.hxx
+++ b/unotools/inc/unotools/configvaluecontainer.hxx
@@ -139,9 +139,6 @@ namespace utl
<p>Usually, in your derived class you simply add a member of the correct type of the configuration
value, and then call this method with the address of this member.</p>
- <p>If the value you want to access may be <NULL/> at runtime, and if you want to recognize such
- <NULL/> values, you may consider using <method>registerNullValueExchangeLocation</method>.</p>
-
@param _pRelativePathAscii
is a relative (ASCII) path of the node which should be "mirrored" into the accessor.
@param _pContainer
@@ -155,21 +152,6 @@ namespace utl
const ::com::sun::star::uno::Type& _rValueType
);
- /** registers a data accessor of an arbitrary type.
-
- <p>Usually, in your derived class you simply add a member of type <type scope="com.sun.star.uno">Any</type>,
- and then call this method with the address of this member.</p>
-
- @param _pRelativePathAscii
- is a relative (ASCII) path of the node which should be "mirrored" into the accessor.
- @param _pContainer
- points to the Any you want to hold the value
- */
- void registerNullValueExchangeLocation(
- const sal_Char* _pRelativePathAscii,
- ::com::sun::star::uno::Any* _pContainer
- );
-
public:
/** reads the configuration data
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index a7fc306..999d3a6 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -322,16 +322,6 @@ namespace utl
implRegisterExchangeLocation( aNewAccessor );
}
- void OConfigurationValueContainer::registerNullValueExchangeLocation( const sal_Char* _pRelativePath, Any* _pContainer )
- {
- // build an accessor for this container
- NodeValueAccessor aNewAccessor( ::rtl::OUString::createFromAscii( _pRelativePath ) );
- aNewAccessor.bind( _pContainer );
-
- // insert it into our structure
- implRegisterExchangeLocation( aNewAccessor );
- }
-
void OConfigurationValueContainer::read( )
{
std::for_each(
diff --git a/unusedcode.easy b/unusedcode.easy
index 118e7a2..aa52f6a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -665,7 +665,6 @@ SdrHint::SetRect(Rectangle const&)
SdrLayerAdmin::MoveLayer(SdrLayer*, unsigned short)
SdrMark::GetObjList() const
SdrMark::GetPage() const
-SdrMarkView::UnmarkGluePoint(SdrHdl const&)
SdrMediaObj::getGraphic() const
SdrMediaObj::hasPreferredSize() const
SdrModel::BegUndo(SdrUndoGroup*)
@@ -720,11 +719,8 @@ SdrTextObj::StopTextAnimation(OutputDevice*, long)
SdrUndoAttrObj::SetRepeatAttr(SfxItemSet const&)
SdrUndoGroup::SdrUndoGroup(SdrModel&, String const&)
SdrUndoGroup::push_front(SdrUndoAction*)
-SdrView::IsDeleteMarkedPossible() const
-SdrView::IsMarkPossible() const
SdrView::MarkNext(Point const&, unsigned char)
SdrView::MarkNext(unsigned char)
-SdrView::SetMarkedRect(Rectangle const&)
SdrViewIter::FirstOutDev()
SdrViewIter::FirstPageView()
SdrViewIter::FirstWindow()
@@ -732,7 +728,6 @@ SdrViewIter::NextOutDev()
SdrViewIter::NextPageView()
SdrViewIter::NextWindow()
SdrViewIter::SdrViewIter(SdrModel const*)
-SdrVirtObj::SdrVirtObj(SdrObject&, Point const&)
SectReprArr::Insert(SectRepr* const&, unsigned short&)
SectReprArr::Insert(SectRepr* const*, unsigned short)
SectReprArr::Insert(SectReprArr const*, unsigned short, unsigned short)
@@ -748,7 +743,6 @@ SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
SfxApplication::Main()
SfxBasicManagerHolder::isAnyContainerModified() const
SfxBrushItemLink::Set(SfxBrushItemLink*)
-SfxChildWindow::SetPosSizePixel(Point const&, Size&)
SfxChildWindowContext::GetAlignment() const
SfxControllerItem::GetCoreMetric() const
SfxControllerItem::UpdateSlot()
@@ -837,9 +831,6 @@ SfxUShortRangesItem::SfxUShortRangesItem(unsigned short, unsigned short const*)
SfxUnoStyleSheet::SfxUnoStyleSheet(SfxStyleSheet const&)
SfxViewFactory::~SfxViewFactory()
SfxViewFrame::Hide()
-SfxViewShell::SetAdditionalPrintOptions(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
-SfxViewShell::SetScrollingMode(SfxScrollingMode)
-SfxWhichIter::LastWhich()
Slider::SetRangeMax(long)
Slider::SetRangeMin(long)
Slider::Slider(Window*, ResId const&)
@@ -861,7 +852,6 @@ SpinButton::SpinButton(Window*, ResId const&)
SplitWindow::CalcWindowSizePixel(Size const&, WindowAlign, long, unsigned char)
SplitWindow::GetItemWindow(unsigned short) const
SplitWindow::SetItemBackground(unsigned short, Wallpaper const&)
-Splitter::GetKeyboardStepSize() const
SrchAttrItemList::Replace(SearchAttrItem const&, unsigned short)
SrchAttrItemList::Replace(SearchAttrItem const*, unsigned short, unsigned short)
SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(SearchAttrItem const&, void*), void*)
@@ -1369,7 +1359,6 @@ SwpHtStart::Insert(SwTxtAttr const*&, unsigned short&)
SwpHtStart::Insert(SwTxtAttr const**, unsigned short)
SwpHtStart::Insert(SwpHtStart const*, unsigned short, unsigned short)
SwpHtStart::Remove(SwTxtAttr const*&, unsigned short)
-SymCharConverter::Convert(Font&, String&, OutputDevice*)
SystemChildWindow::SystemChildWindow(Window*, ResId const&)
TB::NeedsPositioning()
TESortedPositions::Insert(TESortedPositions const*, unsigned short, unsigned short)
@@ -1450,7 +1439,6 @@ WrongRanges::_ForEach(unsigned short, unsigned short, unsigned char (*)(WrongRan
X11SalGraphics::SetMask(int&, int&, unsigned int&, unsigned int&, int&, int&, unsigned long)
X509Certificate_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
XFillExchangeData::RegisterClipboardFormatName()
-XLineEndList::Replace(XLineEndEntry*, long)
XMLAutoTextEventExport::XMLAutoTextEventExport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> const&, unsigned short)
XMLElement::Equals(rtl::OUString)
XMLEmbeddedObjectExportFilter::XMLEmbeddedObjectExportFilter()
@@ -3041,12 +3029,12 @@ utl::MultiAtomProvider::getLastAtom(int) const
utl::MultiAtomProvider::hasAtom(int, int) const
utl::MultiAtomProvider::insertAtomClass(int)
utl::MultiAtomProvider::overrideAtom(int, int, rtl::OUString const&)
+utl::NodeValueAccessor::bind(com::sun::star::uno::Any*)
utl::OConfigurationNode::appendNode(rtl::OUString const&, utl::OConfigurationNode const&) const
utl::OConfigurationTreeRoot::OConfigurationTreeRoot(com::sun::star::uno::Reference<com::sun::star::util::XChangesBatch> const&)
utl::OConfigurationTreeRoot::OConfigurationTreeRoot(comphelper::ComponentContext const&, char const*, bool)
utl::OConfigurationValueContainer::OConfigurationValueContainer(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, osl::Mutex&, rtl::OUString const&, unsigned short, int)
utl::OConfigurationValueContainer::getServiceFactory() const
-utl::OConfigurationValueContainer::registerNullValueExchangeLocation(char const*, com::sun::star::uno::Any*)
utl::TransliterationWrapper::compareSubstring(String const&, int, int, String const&, int, int) const
vcl::Clipboard_getSupportedServiceNames()
vcl::I18nHelper::GetDate(Date const&) const
diff --git a/vcl/inc/vcl/split.hxx b/vcl/inc/vcl/split.hxx
index 66371c6..62cc35c 100644
--- a/vcl/inc/vcl/split.hxx
+++ b/vcl/inc/vcl/split.hxx
@@ -114,7 +114,6 @@ public:
// set the stepsize of the splitter for cursor movement
// the default is 10% of the reference window's width/height
void SetKeyboardStepSize( long nStepSize );
- long GetKeyboardStepSize() const;
void SetStartSplitHdl( const Link& rLink ) { maStartSplitHdl = rLink; }
const Link& GetStartSplitHdl() const { return maStartSplitHdl; }
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 683c114..8cc8d0f 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -194,13 +194,6 @@ void Splitter::SetKeyboardStepSize( long nStepSize )
// -----------------------------------------------------------------------
-long Splitter::GetKeyboardStepSize() const
-{
- return mnKeyboardStepSize;
-}
-
-// -----------------------------------------------------------------------
-
Splitter* Splitter::ImplFindSibling()
{
// look for another splitter with the same parent but different orientation
commit e54fd4b67db9dde9a36fe2ffd5fb4fde3d490c3b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 9 09:09:55 2011 +0100
WaE: constify these (worrying-looking) font name tables
diff --git a/hwpfilter/source/fontmap.cxx b/hwpfilter/source/fontmap.cxx
index d3f9906..de891c7 100644
--- a/hwpfilter/source/fontmap.cxx
+++ b/hwpfilter/source/fontmap.cxx
@@ -150,7 +150,7 @@ const char* RepFontTab[] =
};
#endif
#else
-char* RepFontTab[] =
+const char* RepFontTab[] =
{
"\xb9\xd9\xc5\xc1", /* 0 */
"\xb5\xb8\xbf\xf2", /* 1 */
commit 4a2402bb4eda66268a4624f1e5b974672175402f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 8 22:55:57 2011 +0100
size arg can be const
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index ae7552d..887ea6e 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -189,7 +189,8 @@ public:
void SetAlignment(SfxChildAlignment eAlign);
Size GetSizePixel() const
{ return pWindow->GetSizePixel(); }
- void SetPosSizePixel(const Point& rPoint, Size& rSize);
+ void SetPosSizePixel(const Point& rPoint, const Size& rSize)
+ { pWindow->SetPosSizePixel(rPoint, rSize); }
Point GetPosPixel()
{ return pWindow->GetPosPixel(); }
virtual void Hide();
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 437d188..dc321db 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -325,14 +325,6 @@ void SfxChildWindow::SetAlignment(SfxChildAlignment eAlign)
}
//-------------------------------------------------------------------------
-void SfxChildWindow::SetPosSizePixel(const Point& rPoint, Size& rSize)
-{
- DBG_CHKTHIS(SfxChildWindow,0);
-
- pWindow->SetPosSizePixel(rPoint, rSize);
-}
-
-//-------------------------------------------------------------------------
SfxChildWinInfo SfxChildWindow::GetInfo() const
{
DBG_CHKTHIS(SfxChildWindow,0);
commit 4388c7cab48d3b8ac40e33223e1b5155316f669a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 8 22:47:12 2011 +0100
convert the last of sd's ByteStrings to rtl::OString[Buffer]
fix potential bug in "3D" search while I'm at it I guess
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index ae4433d..1aef0aa 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -352,7 +352,7 @@ protected:
::com::sun::star::awt::Size maSize;
::com::sun::star::awt::Point maPosition;
Rectangle maRect;
- ByteString mType;
+ rtl::OString mType;
sal_Bool mbPresObj;
sal_Bool mbEmptyPresObj;
sal_Int32 mnAngle;
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 8e3a424..62967ac 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -3148,7 +3148,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
}
- else if ( ( (sal_Char)'3' == mType.GetChar( 8 ) ) && ( (char)'D' == mType.GetChar( 9 ) ) ) // drawing.3D
+ else if ( (mType.getLength() > 9) && (mType[8] == '3') && (mType[9] == 'D') ) // drawing.3D
{
// SceneObject, CubeObject, SphereObject, LatheObject, ExtrudeObject, PolygonObject
if ( !ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "Bitmap" ) ) ) )
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 25adbbf..c310a5a 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -43,6 +43,7 @@
#include <vcl/gradient.hxx>
#include <vcl/virdev.hxx>
#include <rtl/ustring.hxx>
+#include <rtl/strbuf.hxx>
#include <svtools/fltcall.hxx>
#include <svtools/wmf.hxx>
#include <sfx2/docfile.hxx>
@@ -765,10 +766,15 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup )
maPosition = MapPoint( mXShape->getPosition() );
maSize = MapSize( mXShape->getSize() );
maRect = Rectangle( Point( maPosition.X, maPosition.Y ), Size( maSize.Width, maSize.Height ) );
- mType = ByteString( String( mXShape->getShapeType() ), RTL_TEXTENCODING_UTF8 );
- mType.Erase( 0, 13 ); // "com.sun.star." entfernen
- sal_uInt16 nPos = mType.Search( (const char*)"Shape" );
- mType.Erase( nPos, 5 );
+
+ rtl::OStringBuffer aTypeBuffer(rtl::OUStringToOString(
+ mXShape->getShapeType(), RTL_TEXTENCODING_UTF8));
+ // "com.sun.star." entfernen
+ aTypeBuffer.remove(0, RTL_CONSTASCII_LENGTH("com.sun.star."));
+
+ sal_Int32 nPos = aTypeBuffer.toString().indexOf("Shape");
+ aTypeBuffer.remove(nPos, RTL_CONSTASCII_LENGTH("Shape"));
+ mType = aTypeBuffer.makeStringAndClear();
mbPresObj = mbEmptyPresObj = sal_False;
if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsPresentationObject" ) ) ) )
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 6cf83a7..b88fcc9 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1765,7 +1765,7 @@ void PowerPointExport::WriteShapeTree( FSHelperPtr pFS, PageType ePageType, sal_
}
if ( GetShapeByIndex( GetCurrentGroupIndex(), sal_True ) ) {
- DBG(printf( "mType: \"%s\"\n", mType.GetBuffer() ));
+ DBG(printf( "mType: \"%s\"\n", mType.getStr() ));
aDML.WriteShape( mXShape );
}
}
commit ebe0549d2688a4d44b6527993c7f6a1fc58c64cc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 8 22:18:05 2011 +0100
Add cppunit test for SwScanner that would have caught fdo#40449
Move SwScanner so it can be tested easily and add a unit test that would have
detected fdo#40449 in advance
diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx
new file mode 100644
index 0000000..d1c6fe9
--- /dev/null
+++ b/sw/inc/swscanner.hxx
@@ -0,0 +1,81 @@
+/* -*- 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 _SWSCANNER_HXX
+#define _SWSCANNER_HXX
+
+#include <i18npool/lang.h>
+#include <modeltoviewhelper.hxx>
+
+class SwTxtNode;
+
+/*************************************************************************
+ * class SwScanner
+ * Hilfsklasse, die beim Spellen die Worte im gewuenschten Bereich
+ * nacheinander zur Verfuegung stellt.
+ *************************************************************************/
+
+class SwScanner
+{
+ rtl::OUString aWord;
+ const SwTxtNode& rNode;
+ const rtl::OUString aText;
+ const LanguageType* pLanguage;
+ const ModelToViewHelper::ConversionMap* pConversionMap;
+ sal_Int32 nStartPos;
+ sal_Int32 nEndPos;
+ sal_Int32 nBegin;
+ sal_Int32 nLen;
+ LanguageType aCurrLang;
+ sal_uInt16 nWordType;
+ sal_Bool bClip;
+
+public:
+ SwScanner( const SwTxtNode& rNd, const rtl::OUString& rTxt,
+ const LanguageType* pLang,
+ const ModelToViewHelper::ConversionMap* pConvMap,
+ sal_uInt16 nWordType,
+ sal_Int32 nStart, sal_Int32 nEnde, sal_Bool bClip = sal_False );
+
+
+ // This next word function tries to find the language for the next word
+ // It should currently _not_ be used for spell checking, and works only for
+ // ! bReverse
+ sal_Bool NextWord();
+
+ const rtl::OUString& GetWord() const { return aWord; }
+
+ sal_Int32 GetBegin() const { return nBegin; }
+ sal_Int32 GetEnd() const { return nBegin + nLen; }
+ sal_Int32 GetLen() const { return nLen; }
+
+ LanguageType GetCurrentLanguage() const {return aCurrLang;}
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index 2e53d26..f87a2c2 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -57,9 +57,11 @@
#include "swtypes.hxx"
#include "docstat.hxx"
#include "doc.hxx"
+#include "ndtxt.hxx"
#include "docsh.hxx"
#include "shellres.hxx"
#include "docufld.hxx"
+#include "swscanner.hxx"
#include "swcrsr.hxx"
#include "swmodule.hxx"
@@ -83,12 +85,14 @@ public:
void testPageDescName();
void testFileNameFields();
void testDocStat();
+ void testSwScanner();
CPPUNIT_TEST_SUITE(SwDocTest);
CPPUNIT_TEST(randomTest);
CPPUNIT_TEST(testPageDescName);
CPPUNIT_TEST(testFileNameFields);
CPPUNIT_TEST(testDocStat);
+ CPPUNIT_TEST(testSwScanner);
CPPUNIT_TEST_SUITE_END();
private:
@@ -175,6 +179,9 @@ void SwDocTest::testFileNameFields()
m_xDocShRef->DoInitNew(0);
}
+//See http://lists.freedesktop.org/archives/libreoffice/2011-August/016666.html
+//Remove unnecessary parameter to IDocumentStatistics::UpdateDocStat for
+//motivation
void SwDocTest::testDocStat()
{
CPPUNIT_ASSERT_MESSAGE("Expected initial 0 count", m_pDoc->GetDocStat().nChar == 0);
@@ -195,6 +202,36 @@ void SwDocTest::testDocStat()
CPPUNIT_ASSERT_MESSAGE("And cache is updated too", m_pDoc->GetDocStat().nChar == nLen);
}
+//See https://bugs.freedesktop.org/show_bug.cgi?id=40449 for motivation
+void SwDocTest::testSwScanner()
+{
+ SwNodeIndex aIdx(m_pDoc->GetNodes().GetEndOfContent(), -1);
+ SwPaM aPaM(aIdx);
+
+ const SwTxtNode* pTxtNode = aPaM.GetNode()->GetTxtNode();
+
+ CPPUNIT_ASSERT_MESSAGE("Has Text Node", pTxtNode);
+
+ //Use a temporary rtl::OUString as the arg, as that's the trouble behind
+ //fdo#40449 and fdo#39365
+ SwScanner aScanner(*pTxtNode,
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hello World")),
+ 0, 0, i18n::WordType::DICTIONARY_WORD, 0,
+ RTL_CONSTASCII_LENGTH("Hello World"));
+
+ bool bFirstOk = aScanner.NextWord();
+ CPPUNIT_ASSERT_MESSAGE("First Token", bFirstOk);
+ const rtl::OUString &rHello = aScanner.GetWord();
+ CPPUNIT_ASSERT_MESSAGE("Should be Hello",
+ rHello.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Hello")));
+
+ bool bSecondOk = aScanner.NextWord();
+ CPPUNIT_ASSERT_MESSAGE("Second Token", bSecondOk);
+ const rtl::OUString &rWorld = aScanner.GetWord();
+ CPPUNIT_ASSERT_MESSAGE("Should be World",
+ rWorld.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("World")));
+}
+
static int
getRand(int modulus)
{
@@ -206,7 +243,8 @@ getRand(int modulus)
static rtl::OUString
getRandString()
{
- static rtl::OUString aText( rtl::OUString::createFromAscii("AAAAA BBBB CCC DD E \n"));
+ static rtl::OUString aText(RTL_CONSTASCII_USTRINGPARAM(
+ "AAAAA BBBB CCC DD E \n"));
int s = getRand(aText.getLength());
int j = getRand(aText.getLength() - s);
rtl::OUString aRet(aText + s, j);
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index f55c77e..7dd9827 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -32,10 +32,8 @@
#define _SVSTDARR_XUB_STRLEN
#include <svl/svstdarr.hxx>
#endif
-#include <i18npool/lang.h>
#include <list>
-#include <modeltoviewhelper.hxx>
-
+#include "swscanner.hxx"
class SwTxtNode;
class Point;
@@ -46,49 +44,6 @@ typedef std::list< xub_StrLen > PositionList;
#define SPACING_PRECISION_FACTOR 100
/*************************************************************************
- * class SwScanner
- * Hilfsklasse, die beim Spellen die Worte im gewuenschten Bereich
- * nacheinander zur Verfuegung stellt.
- *************************************************************************/
-
-class SwScanner
-{
- rtl::OUString aWord;
- const SwTxtNode& rNode;
- const rtl::OUString aText;
- const LanguageType* pLanguage;
- const ModelToViewHelper::ConversionMap* pConversionMap;
- sal_Int32 nStartPos;
- sal_Int32 nEndPos;
- sal_Int32 nBegin;
- sal_Int32 nLen;
- LanguageType aCurrLang;
- sal_uInt16 nWordType;
- sal_Bool bClip;
-
-public:
- SwScanner( const SwTxtNode& rNd, const rtl::OUString& rTxt,
- const LanguageType* pLang,
- const ModelToViewHelper::ConversionMap* pConvMap,
- sal_uInt16 nWordType,
- sal_Int32 nStart, sal_Int32 nEnde, sal_Bool bClip = sal_False );
-
-
- // This next word function tries to find the language for the next word
- // It should currently _not_ be used for spell checking, and works only for
- // ! bReverse
- sal_Bool NextWord();
-
- const rtl::OUString& GetWord() const { return aWord; }
-
- sal_Int32 GetBegin() const { return nBegin; }
- sal_Int32 GetEnd() const { return nBegin + nLen; }
- sal_Int32 GetLen() const { return nLen; }
-
- LanguageType GetCurrentLanguage() const {return aCurrLang;}
-};
-
-/*************************************************************************
* class SwScriptInfo
*
* encapsultes information about script changes
More information about the Libreoffice-commits
mailing list