[Libreoffice-commits] core.git: compilerplugins/clang editeng/source include/editeng include/sfx2 include/svl include/svx include/vcl lotuswordpro/source reportdesign/source sc/source sdext/source sd/inc sd/source sfx2/source slideshow/source starmath/source svl/source svx/inc svx/source sw/inc sw/source vcl/inc vcl/source vcl/unx writerfilter/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Sep 27 09:49:11 UTC 2018
compilerplugins/clang/methodcycles.partition.results | 98 ++++
compilerplugins/clang/methodcycles.py | 123 +++--
compilerplugins/clang/methodcycles.results | 33 -
editeng/source/uno/unoedprx.cxx | 17
editeng/source/uno/unoviwou.cxx | 28 -
include/editeng/unoedprx.hxx | 3
include/editeng/unoedsrc.hxx | 12
include/editeng/unoviwou.hxx | 1
include/sfx2/objsh.hxx | 2
include/svl/style.hxx | 1
include/svx/sdr/contact/objectcontact.hxx | 12
include/svx/sdr/contact/objectcontactofobjlistpainter.hxx | 3
include/svx/sdr/overlay/overlaymanager.hxx | 3
include/svx/svdmrkv.hxx | 1
include/svx/svdobj.hxx | 2
include/svx/svdogrp.hxx | 1
include/svx/svdotable.hxx | 1
include/svx/svdotext.hxx | 1
include/svx/svdovirt.hxx | 2
include/svx/svdpage.hxx | 1
include/svx/svdundo.hxx | 2
include/svx/unoshtxt.hxx | 1
include/vcl/field.hxx | 4
lotuswordpro/source/filter/lwplayout.cxx | 36 -
lotuswordpro/source/filter/lwplayout.hxx | 2
reportdesign/source/core/inc/ReportUndoFactory.hxx | 2
reportdesign/source/core/sdr/ReportUndoFactory.cxx | 11
sc/source/ui/Accessibility/AccessibleText.cxx | 235 -----------
sc/source/ui/docshell/docsh.cxx | 13
sc/source/ui/inc/docsh.hxx | 1
sc/source/ui/vba/vbacondition.cxx | 14
sc/source/ui/vba/vbacondition.hxx | 2
sc/source/ui/vba/vbaformatcondition.cxx | 8
sc/source/ui/vba/vbaformatcondition.hxx | 1
sd/inc/sdpage.hxx | 1
sd/inc/stlsheet.hxx | 2
sd/source/core/sdpage.cxx | 8
sd/source/core/stlsheet.cxx | 11
sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx | 20
sd/source/ui/docshell/docshell.cxx | 45 --
sd/source/ui/inc/AccessibleOutlineEditSource.hxx | 1
sd/source/ui/inc/DrawDocShell.hxx | 1
sd/source/ui/inc/View.hxx | 1
sd/source/ui/view/sdview.cxx | 7
sdext/source/pdfimport/inc/genericelements.hxx | 1
sdext/source/pdfimport/tree/genericelements.cxx | 30 -
sfx2/source/doc/objmisc.cxx | 11
slideshow/source/engine/shapeattributelayer.cxx | 8
slideshow/source/inc/shapeattributelayer.hxx | 4
starmath/source/accessibility.cxx | 53 --
starmath/source/accessibility.hxx | 2
svl/source/items/style.cxx | 4
svx/inc/sdr/contact/objectcontactofpageview.hxx | 12
svx/inc/sdr/overlay/overlaymanagerbuffered.hxx | 3
svx/source/accessibility/AccessibleEmptyEditSource.cxx | 1
svx/source/sdr/contact/objectcontact.cxx | 25 -
svx/source/sdr/contact/objectcontactofobjlistpainter.cxx | 6
svx/source/sdr/contact/objectcontactofpageview.cxx | 46 --
svx/source/sdr/contact/viewobjectcontactofpageobj.cxx | 6
svx/source/sdr/overlay/overlaymanager.cxx | 5
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 10
svx/source/svdraw/svdmrkv1.cxx | 17
svx/source/svdraw/svdobj.cxx | 16
svx/source/svdraw/svdogrp.cxx | 5
svx/source/svdraw/svdotext.cxx | 15
svx/source/svdraw/svdovirt.cxx | 11
svx/source/svdraw/svdpage.cxx | 33 -
svx/source/svdraw/svdundo.cxx | 10
svx/source/table/svdotable.cxx | 12
svx/source/unodraw/unoshtxt.cxx | 35 -
sw/inc/docsh.hxx | 1
sw/source/uibase/app/docsh.cxx | 4
sw/source/uibase/inc/drawbase.hxx | 1
sw/source/uibase/inc/dselect.hxx | 3
sw/source/uibase/ribbar/drawbase.cxx | 85 ----
sw/source/uibase/ribbar/dselect.cxx | 29 -
vcl/inc/printerinfomanager.hxx | 22 -
vcl/inc/unx/cpdmgr.hxx | 6
vcl/inc/unx/cupsmgr.hxx | 7
vcl/source/control/field.cxx | 7
vcl/source/control/field2.cxx | 6
vcl/unx/generic/printer/cpdmgr.cxx | 39 -
vcl/unx/generic/printer/cupsmgr.cxx | 93 ----
vcl/unx/generic/printer/printerinfomanager.cxx | 267 -------------
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 8
writerfilter/source/dmapper/TableManager.cxx | 13
writerfilter/source/dmapper/TableManager.hxx | 8
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 15
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 2
89 files changed, 190 insertions(+), 1581 deletions(-)
New commits:
commit 1534025a0386584a7b8f3f929b10ce5eb33257cf
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Sep 23 08:48:06 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Sep 27 11:48:46 2018 +0200
loplugin:methodcycles more graph theory for the win
implemeent a reduction approach, which is good at finding virtual
methods that only themselves or their virtual partners.
The accessibility GetVisArea stuff is dead since
commit 891e41fac81fbd8d5cdb277b26639abfd25a7143
Date: Wed Apr 4 11:23:22 2018 +0200
dead code in AccessibleTextHelper_Impl::UpdateVisibleChildren
Change-Id: I78d9d8bca585ecec8394f2c3fe2baa93db0e58f5
Reviewed-on: https://gerrit.libreoffice.org/60912
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/methodcycles.partition.results b/compilerplugins/clang/methodcycles.partition.results
new file mode 100644
index 000000000000..91537c8ec813
--- /dev/null
+++ b/compilerplugins/clang/methodcycles.partition.results
@@ -0,0 +1,98 @@
+callDict size 32
+
+
+void writerfilter::ooxml::OOXMLFastContextHandler::setParent(writerfilter::ooxml::OOXMLFastContextHandler *)
+writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:122
+
+int SdrMarkView::GetMarkedPointCount() const
+include/svx/svdmrkv.hxx:314
+
+void SvxTextForwarder::SetUpdateModeForAcc(bool)
+include/editeng/unoedsrc.hxx:218
+
+bool psp::PrinterInfoManager::writePrinterConfig()
+vcl/inc/printerinfomanager.hxx:172
+
+void sdr::overlay::OverlayManager::restoreBackground(const vcl::Region &) const
+include/svx/sdr/overlay/overlaymanager.hxx:107
+
+bool psp::PrinterInfoManager::setDefaultPrinter(const rtl::OUString &)
+vcl/inc/printerinfomanager.hxx:176
+
+SdrUndoAction * SdrUndoFactory::CreateUndoMoveLayer(unsigned short,SdrLayerAdmin &,SdrModel &,unsigned short)
+include/svx/svdundo.hxx:758
+
+void writerfilter::dmapper::TableManager::cellPropsByCell(unsigned int,const tools::SvRef<writerfilter::dmapper::TablePropertyMap> &)
+writerfilter/source/dmapper/TableManager.hxx:452
+
+double LwpVirtualLayout::GetColWidth(unsigned short)
+lotuswordpro/source/filter/lwplayout.hxx:102
+
+double slideshow::internal::ShapeAttributeLayer::getCharRotationAngle() const
+slideshow/source/inc/shapeattributelayer.hxx:385
+
+bool SwDrawBase::KeyInput(const KeyEvent &)
+sw/source/uibase/inc/drawbase.hxx:53
+
+void SdrObject::ReformatText()
+include/svx/svdobj.hxx:685
+
+void FormatterBase::SetLocale(const com::sun::star::lang::Locale &)
+include/vcl/field.hxx:78
+
+std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > writerfilter::ooxml::OOXMLFastContextHandler::getType() const
+writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:88
+
+bool sdr::contact::ObjectContact::isDrawModeBlackWhite() const
+include/svx/sdr/contact/objectcontact.hxx:154
+
+void ScVbaCondition::setFormula1(const com::sun::star::uno::Any &)
+sc/source/ui/vba/vbacondition.hxx:42
+
+void sax_fastparser::FastSaxSerializer::ForMerge::print()
+sax/source/tools/fastserializer.hxx:184
+
+bool SvxTextForwarder::GetUpdateModeForAcc() const
+include/editeng/unoedsrc.hxx:219
+
+rtl::OUString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec &) const
+include/svx/svdobj.hxx:695
+
+bool psp::PrinterInfoManager::removePrinter(const rtl::OUString &,bool)
+vcl/inc/printerinfomanager.hxx:168
+
+bool sdr::contact::ObjectContact::isOutputToWindow() const
+include/svx/sdr/contact/objectcontact.hxx:139
+
+void SfxStyleSheetBase::Load(SvStream &,unsigned short)
+include/svl/style.hxx:135
+
+void SfxObjectShell::PrepareReload()
+include/sfx2/objsh.hxx:440
+
+void SfxObjectShell::InPlaceActivate(bool)
+include/sfx2/objsh.hxx:583
+
+bool sdr::contact::ObjectContact::IsAreaVisible(const basegfx::B2DRange &) const
+include/svx/sdr/contact/objectcontact.hxx:116
+
+void sfx2::sidebar::Deck::PrintWindowSubTree(vcl::Window *,int)
+include/sfx2/sidebar/Deck.hxx:70
+
+void pdfi::PageElement::updateParagraphGeometry(pdfi::Element *)
+sdext/source/pdfimport/inc/genericelements.hxx:257
+
+bool sdr::contact::ObjectContact::isOutputToVirtualDevice() const
+include/svx/sdr/contact/objectcontact.hxx:142
+
+tools::Rectangle SvxViewForwarder::GetVisArea() const
+include/editeng/unoedsrc.hxx:470
+
+bool psp::PrinterInfoManager::addPrinter(const rtl::OUString &,const rtl::OUString &)
+vcl/inc/printerinfomanager.hxx:161
+
+SdrUndoAction * SdrUndoFactory::CreateUndoMoveObject(SdrObject &)
+include/svx/svdundo.hxx:733
+
+SdrObject * SdrObjList::NbcReplaceObject(SdrObject *,unsigned long)
+include/svx/svdpage.hxx:126
diff --git a/compilerplugins/clang/methodcycles.py b/compilerplugins/clang/methodcycles.py
index 8ff814da8bd5..d57c85ff963d 100755
--- a/compilerplugins/clang/methodcycles.py
+++ b/compilerplugins/clang/methodcycles.py
@@ -81,7 +81,7 @@ def sort_set_by_natural_key(s):
# --------------------------------------------------------------------------------------------
# follow caller-callee chains, removing all methods reachable from a root method
-def remove_reachable(startCaller):
+def remove_reachable(callDict, startCaller):
worklist = list()
worklist.append(startCaller)
while len(worklist) > 0:
@@ -151,12 +151,18 @@ for caller in callDict:
to_be_removed.add(caller)
# remove everything reachable from the found entry points
for caller in to_be_removed:
- remove_reachable(caller)
+ remove_reachable(callDict, caller)
for caller in callDict:
callDict[caller] -= to_be_removed
+# create a reverse call graph
+inverseCallDict = defaultdict(set) # map of from_method_name -> set(method_name)
+for caller in callDict:
+ for callee in callDict[caller]:
+ inverseCallDict[callee].add(caller)
+
print_tree_recurse_set = set() # protect against cycles
-def print_tree(f, caller, depth):
+def print_tree(f, callDict, caller, depth):
if depth == 0:
f.write("\n") # add an empty line before each tree
print_tree_recurse_set.clear()
@@ -172,13 +178,7 @@ def print_tree(f, caller, depth):
f.write(" " * depth + definitionToSourceLocationMap[caller] + "\n")
calleeSet = callDict[caller]
for c in calleeSet:
- print_tree(f, c, depth+1)
-
-# create a reverse call graph
-inverseCallDict = defaultdict(set) # map of from_method_name -> set(method_name)
-for caller in callDict:
- for callee in callDict[caller]:
- inverseCallDict[callee].add(caller)
+ print_tree(f, callDict, c, depth+1)
# find possible roots (ie. entrypoints) by looking for methods that are not called
def dump_possible_roots():
@@ -201,42 +201,75 @@ def dump_possible_roots():
count = count + 1
#if count>1000: break
-
# Look for cycles in a directed graph
# Adapted from:
# https://codereview.stackexchange.com/questions/86021/check-if-a-directed-graph-contains-a-cycle
-with open("compilerplugins/clang/methodcycles.results", "wt") as f:
- path = set()
- visited = set()
-
- def printPath(path):
- if len(path) < 2:
- return
- # we may have found a cycle, but if the cycle is called from outside the cycle
- # the code is still in use.
- for p in path:
- for caller in inverseCallDict[p]:
- if not caller in path:
- return
- f.write("found cycle\n")
- for p in path:
- f.write(" " + p + "\n")
- f.write(" " + definitionToSourceLocationMap[p] + "\n")
- f.write("\n")
-
- def checkCyclic(vertex):
- if vertex in visited:
- return
- visited.add(vertex)
- path.add(vertex)
- if vertex in callDict:
- for neighbour in callDict[vertex]:
- if neighbour in path:
- printPath(path)
- break
- else:
- checkCyclic(neighbour)
- path.remove(vertex)
+def print_cycles():
+ with open("compilerplugins/clang/methodcycles.results", "wt") as f:
+ path = set()
+ visited = set()
- for caller in callDict:
- checkCyclic(caller)
+ def printPath(path):
+ if len(path) < 2:
+ return
+ # we may have found a cycle, but if the cycle is called from outside the cycle
+ # the code is still in use.
+ for p in path:
+ for caller in inverseCallDict[p]:
+ if not caller in path:
+ return
+ f.write("found cycle\n")
+ for p in path:
+ f.write(" " + p + "\n")
+ f.write(" " + definitionToSourceLocationMap[p] + "\n")
+ f.write("\n")
+
+ def checkCyclic(vertex):
+ if vertex in visited:
+ return
+ visited.add(vertex)
+ path.add(vertex)
+ if vertex in callDict:
+ for neighbour in callDict[vertex]:
+ if neighbour in path:
+ printPath(path)
+ break
+ else:
+ checkCyclic(neighbour)
+ path.remove(vertex)
+
+ for caller in callDict:
+ checkCyclic(caller)
+
+print_cycles()
+
+# print partioned sub-graphs
+def print_partitions():
+ callDict2 = callDict
+ # Remove anything with no callees, and that is itself not called.
+ # After this stage, we should only be left with closed sub-graphs ie. partitions
+ while True:
+ to_be_removed.clear()
+ for caller in callDict2:
+ if len(callDict2[caller]) == 0 \
+ or not caller in inverseCallDict[caller]:
+ to_be_removed.add(caller)
+ if len(to_be_removed) == 0:
+ break
+ for caller in to_be_removed:
+ remove_reachable(callDict2, caller)
+ for caller in callDict2:
+ callDict2[caller] -= to_be_removed
+
+ count = 0
+ with open("compilerplugins/clang/methodcycles.partition.results", "wt") as f:
+ f.write("callDict size " + str(len(callDict2)) + "\n")
+ f.write("\n")
+ while len(callDict2) > 0:
+ print_tree(f, callDict2, next(iter(callDict2)), 0)
+ for c in print_tree_recurse_set:
+ callDict2.pop(c, None)
+ count = count + 1
+ if count>1000: break
+
+print_partitions()
\ No newline at end of file
diff --git a/compilerplugins/clang/methodcycles.results b/compilerplugins/clang/methodcycles.results
index 403178b25a10..19e874c77d27 100644
--- a/compilerplugins/clang/methodcycles.results
+++ b/compilerplugins/clang/methodcycles.results
@@ -1,11 +1,4 @@
found cycle
- bool connectivity::OSQLParseTreeIterator::impl_getColumnTableRange(const connectivity::OSQLParseNode *,rtl::OUString &) const
- include/connectivity/sqliterator.hxx:272
-
- bool connectivity::OSQLParseTreeIterator::getColumnTableRange(const connectivity::OSQLParseNode *,rtl::OUString &) const
- include/connectivity/sqliterator.hxx:259
-
-found cycle
void (anonymous namespace)::traceValue(_typelib_TypeDescriptionReference *,void *)
cppu/source/LogBridge/LogBridge.cxx:132
@@ -16,40 +9,16 @@ found cycle
cppu/source/LogBridge/LogBridge.cxx:192
found cycle
- rtl::OUString lcl_dbg_out(SwNodes &)
- sw/source/core/doc/dbgoutsw.cxx:743
-
- void lcl_dbg_nodes_inner(rtl::OUString &,SwNodes &,unsigned long &)
- sw/source/core/doc/dbgoutsw.cxx:694
-
- const char * dbg_out(SwNodes &)
- sw/inc/dbgoutsw.hxx:67
-
-found cycle
- void OutputDevice::DrawPixel(const tools::Polygon &,const Color &)
- include/vcl/outdev.hxx:710
-
- void OutputDevice::DrawPixel(const tools::Polygon &,const Color *)
- include/vcl/outdev.hxx:709
-
-found cycle
void SbxVariable::Dump(SvStream &,bool)
include/basic/sbxvar.hxx:260
void SbxObject::Dump(SvStream &,bool)
- include/basic/sbxobj.hxx:81
+ include/basic/sbxobj.hxx:80
void SbRtl_DumpAllObjects(StarBASIC *,SbxArray &,bool)
basic/source/inc/rtlproto.hxx:293
found cycle
- SbxVariable * SbxArray::FindUserData(unsigned int)
- include/basic/sbx.hxx:138
-
- SbxVariable * SbxObject::FindUserData(unsigned int)
- include/basic/sbxobj.hxx:60
-
-found cycle
unsigned long slideshow::internal::hash::operator()(const type-parameter-?-? &) const
slideshow/source/inc/tools.hxx:83
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 6a109d0c19b0..dc1dbfc69ec7 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -679,16 +679,6 @@ EBulletInfo SvxAccessibleTextAdapter::GetBulletInfo( sal_Int32 nPara ) const
return mpTextForwarder->GetBulletInfo( nPara );
}
-void SvxAccessibleTextAdapter::SetUpdateModeForAcc(bool bUp)
-{
- return mpTextForwarder->SetUpdateModeForAcc(bUp);
-}
-
-bool SvxAccessibleTextAdapter::GetUpdateModeForAcc( ) const
-{
- return mpTextForwarder->GetUpdateModeForAcc();
-}
-
tools::Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const
{
assert(mpTextForwarder && "SvxAccessibleTextAdapter: no forwarder");
@@ -1125,13 +1115,6 @@ bool SvxAccessibleTextEditViewAdapter::IsValid() const
return false;
}
-tools::Rectangle SvxAccessibleTextEditViewAdapter::GetVisArea() const
-{
- DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
-
- return mpViewForwarder->GetVisArea();
-}
-
Point SvxAccessibleTextEditViewAdapter::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const
{
DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
diff --git a/editeng/source/uno/unoviwou.cxx b/editeng/source/uno/unoviwou.cxx
index 4da65606f8fe..b437c09479d0 100644
--- a/editeng/source/uno/unoviwou.cxx
+++ b/editeng/source/uno/unoviwou.cxx
@@ -51,34 +51,6 @@ bool SvxDrawOutlinerViewForwarder::IsValid() const
return true;
}
-tools::Rectangle SvxDrawOutlinerViewForwarder::GetVisArea() const
-{
- OutputDevice* pOutDev = mrOutlinerView.GetWindow();
-
- if( pOutDev )
- {
- tools::Rectangle aVisArea = mrOutlinerView.GetVisArea();
-
- Point aTextOffset( GetTextOffset() );
- aVisArea.Move( aTextOffset.X(), aTextOffset.Y() );
-
- // figure out map mode from edit engine
- Outliner* pOutliner = mrOutlinerView.GetOutliner();
-
- if( pOutliner )
- {
- MapMode aMapMode(pOutDev->GetMapMode());
- aVisArea = OutputDevice::LogicToLogic( aVisArea,
- pOutliner->GetRefMapMode(),
- MapMode(aMapMode.GetMapUnit()));
- aMapMode.SetOrigin(Point());
- return pOutDev->LogicToPixel( aVisArea, aMapMode );
- }
- }
-
- return tools::Rectangle();
-}
-
Point SvxDrawOutlinerViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const
{
OutputDevice* pOutDev = mrOutlinerView.GetWindow();
diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx
index dd296af6375f..b0abe19ad0fd 100644
--- a/include/editeng/unoedprx.hxx
+++ b/include/editeng/unoedprx.hxx
@@ -72,8 +72,6 @@ public:
virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const override;
virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const override;
virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const override;
- virtual void SetUpdateModeForAcc( bool bUp) override;
- virtual bool GetUpdateModeForAcc() const override;
virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const override;
virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const override;
@@ -118,7 +116,6 @@ public:
// SvxViewForwarder interface
virtual bool IsValid() const override;
- virtual tools::Rectangle GetVisArea() const override;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override;
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index 3c7952bad1cc..c3e22c9767a3 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -215,9 +215,6 @@ public:
*/
virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const = 0;
- virtual void SetUpdateModeForAcc(bool) {}
- virtual bool GetUpdateModeForAcc() const { return true; }
-
/** Query the bounding rectangle of the given character
@param nPara[0 .. n]
@@ -460,15 +457,6 @@ public:
*/
virtual bool IsValid() const = 0;
- /** Query visible area of the view containing the text
-
- @return the visible rectangle of the text, i.e. the part of
- the EditEngine or Outliner that is currently on screen. The
- values are already in screen coordinates (pixel), and have to
- be relative to the EditEngine/Outliner's upper left corner.
- */
- virtual tools::Rectangle GetVisArea() const = 0;
-
/** Convert from logical, EditEngine-relative coordinates to screen coordinates
@param rPoint
diff --git a/include/editeng/unoviwou.hxx b/include/editeng/unoviwou.hxx
index 7a4dc1c2b3ca..39ed56ff7561 100644
--- a/include/editeng/unoviwou.hxx
+++ b/include/editeng/unoviwou.hxx
@@ -41,7 +41,6 @@ public:
virtual bool IsValid() const override;
- virtual tools::Rectangle GetVisArea() const override;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 1c31ed32d9c6..54d97faf3162 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -437,7 +437,6 @@ public:
Size GetFirstPageSize();
bool DoClose();
- virtual void PrepareReload();
std::shared_ptr<GDIMetaFile> GetPreviewMetaFile( bool bFullContent = false ) const;
virtual void CancelTransfers();
@@ -580,7 +579,6 @@ public:
static OUString GetServiceNameFromFactory( const OUString& rFact );
bool IsInPlaceActive();
bool IsUIActive();
- virtual void InPlaceActivate( bool );
static bool CopyStoragesOfUnknownMediaType(
const css::uno::Reference< css::embed::XStorage >& xSource,
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 4bf91c357765..c60d85fb833e 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -132,7 +132,6 @@ protected:
SfxStyleSheetBase( const OUString&, SfxStyleSheetBasePool*, SfxStyleFamily eFam, SfxStyleSearchBits mask );
SfxStyleSheetBase( const SfxStyleSheetBase& );
virtual ~SfxStyleSheetBase() override;
- virtual void Load( SvStream&, sal_uInt16 );
public:
diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx
index 9af38ca77d62..d305d61b007d 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -112,9 +112,6 @@ public:
// this ObjectContact. Default does nothing.
virtual void InvalidatePartOfView(const basegfx::B2DRange& rRange) const;
- // Get info if given Rectangle is visible in this view
- virtual bool IsAreaVisible(const basegfx::B2DRange& rRange) const;
-
// Get info about the need to visualize GluePoints. The default
// is that it is not necessary.
virtual bool AreGluePointsVisible() const;
@@ -135,12 +132,6 @@ public:
// print? Default is false
virtual bool isOutputToPrinter() const;
- // window? Default is true
- virtual bool isOutputToWindow() const;
-
- // VirtualDevice? Default is false
- virtual bool isOutputToVirtualDevice() const;
-
// recording MetaFile? Default is false
virtual bool isOutputToRecordingMetaFile() const;
@@ -150,9 +141,6 @@ public:
// gray display mode
virtual bool isDrawModeGray() const;
- // gray display mode
- virtual bool isDrawModeBlackWhite() const;
-
// high contrast display mode
virtual bool isDrawModeHighContrast() const;
diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
index 7390f30b08a7..d9d0ffbf795b 100644
--- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
@@ -71,9 +71,6 @@ public:
// Process the whole displaying
virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) override;
- // VirtualDevice? Default is false
- virtual bool isOutputToVirtualDevice() const override;
-
// recording MetaFile? Default is false
virtual bool isOutputToRecordingMetaFile() const override;
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index 25cae11e9dbc..7028f46b4a69 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -103,9 +103,6 @@ namespace sdr
// flush. Do buffered updates.
virtual void flush();
- // restore part of background. Implemented form buffered versions only.
- virtual void restoreBackground(const vcl::Region& rRegion) const;
-
// get the OutputDevice
OutputDevice& getOutputDevice() const { return mrOutputDevice; }
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index ff3c5bff5d1d..08e0d10d5e62 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -311,7 +311,6 @@ public:
virtual bool HasMarkablePoints() const;
virtual sal_Int32 GetMarkablePointCount() const;
virtual bool HasMarkedPoints() const;
- virtual sal_Int32 GetMarkedPointCount() const;
// There might be points which can't be marked:
virtual bool IsPointMarkable(const SdrHdl& rHdl) const;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 91225c243545..76fc5e04f850 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -682,7 +682,6 @@ public:
virtual void NbcSetOutlinerParaObject(std::unique_ptr<OutlinerParaObject> pTextObject);
virtual OutlinerParaObject* GetOutlinerParaObject() const;
virtual void NbcReformatText();
- virtual void ReformatText();
void BurnInStyleSheetAttributes();
@@ -692,7 +691,6 @@ public:
virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const;
virtual void PaintMacro (OutputDevice& rOut, const tools::Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const;
virtual bool DoMacro (const SdrObjMacroHitRec& rRec);
- virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const;
bool IsMacroHit(const SdrObjMacroHitRec& rRec) const;
// Connectors
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index 24f2159e7bf8..bd1287c19449 100644
--- a/include/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
@@ -103,7 +103,6 @@ public:
virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override;
virtual void NbcReformatText() override;
- virtual void ReformatText() override;
virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const override;
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index b6cf526970a7..ff0f9e77c334 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -241,7 +241,6 @@ public:
virtual OutlinerParaObject* GetOutlinerParaObject() const override;
virtual void NbcReformatText() override;
- virtual void ReformatText() override;
virtual bool IsVerticalWriting() const override;
virtual void SetVerticalWriting(bool bVertical) override;
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 9bca148fd443..82d7d9b0657d 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -493,7 +493,6 @@ public:
std::unique_ptr<OutlinerParaObject> GetEditOutlinerParaObject() const;
virtual void NbcReformatText() override;
- virtual void ReformatText() override;
virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos,
bool bEdit, boost::optional<Color>& rpTxtColor, boost::optional<Color>& rpFldColor, OUString& rRet) const;
diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx
index 47ed2f4b1d03..8ab92bd69e8d 100644
--- a/include/svx/svdovirt.hxx
+++ b/include/svx/svdovirt.hxx
@@ -134,14 +134,12 @@ public:
virtual void SetGeoData(const SdrObjGeoData& rGeo) override;
virtual void NbcReformatText() override;
- virtual void ReformatText() override;
virtual bool HasMacro() const override;
virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const override;
virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const override;
virtual void PaintMacro (OutputDevice& rOut, const tools::Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const override;
virtual bool DoMacro (const SdrObjMacroHitRec& rRec) override;
- virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const override;
// #i73248# for default SdrVirtObj, offset is aAnchor, not (0,0)
virtual const Point GetOffset() const;
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 6041593c9f50..0d76d7e6dbab 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -123,7 +123,6 @@ public:
/// Replace existing object by different one.
/// Same as Remove(old)+Insert(new) but faster because the order numbers
/// do not have to be set dirty.
- virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum);
virtual SdrObject* ReplaceObject(SdrObject* pNewObj, size_t nObjNum);
/// Modify ZOrder of an SdrObject
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 6d8896916bcd..9e969ebbbb4f 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -730,7 +730,6 @@ class SVX_DLLPUBLIC SdrUndoFactory
public:
// Shapes
virtual ~SdrUndoFactory();
- virtual SdrUndoAction* CreateUndoMoveObject( SdrObject& rObject );
virtual SdrUndoAction* CreateUndoMoveObject( SdrObject& rObject, const Size& rDist );
virtual SdrUndoAction* CreateUndoGeoObject( SdrObject& rObject );
virtual SdrUndoAction* CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1 = false, bool bSaveText = false );
@@ -755,7 +754,6 @@ public:
// Layer
virtual SdrUndoAction* CreateUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel);
virtual SdrUndoAction* CreateUndoDeleteLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel);
- virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNewPos1);
// Page
virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage);
diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx
index 55afd0f40207..9acd57f6172c 100644
--- a/include/svx/unoshtxt.hxx
+++ b/include/svx/unoshtxt.hxx
@@ -73,7 +73,6 @@ public:
// the SvxViewForwarder interface
virtual bool IsValid() const override;
- virtual tools::Rectangle GetVisArea() const override;
virtual Point LogicToPixel( const Point&, const MapMode& ) const override;
virtual Point PixelToLogic( const Point&, const MapMode& ) const override;
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index c57e511d7767..e9407fa66f32 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -75,7 +75,6 @@ public:
virtual void Reformat();
virtual void ReformatAll();
- virtual void SetLocale( const css::lang::Locale& rLocale );
const css::lang::Locale& GetLocale() const;
const LanguageTag& GetLanguageTag() const;
@@ -313,9 +312,6 @@ public:
virtual void Reformat() override;
virtual void ReformatAll() override;
- virtual void SetLocale( const css::lang::Locale& rLocale ) override;
-
-
void SetExtDateFormat( ExtDateFieldFormat eFormat );
ExtDateFieldFormat GetExtDateFormat( bool bResolveSystemFormat = false ) const;
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index 115c4635b339..d79217319ff3 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -123,17 +123,6 @@ bool LwpVirtualLayout::MarginsSameAsParent()
}
/**
-* @descr: Get column width
-*
-*/
-double LwpVirtualLayout::GetColWidth(sal_uInt16 /*nIndex*/)
-{
- //return GetContentWidth(); //not support now
- //return LwpTools::ConvertToMetric(5); //test
- return 0; //test
-}
-
-/**
* @descr: Get the gap between columns
*
*/
@@ -1557,31 +1546,6 @@ sal_uInt16 LwpLayout::GetNumCols()
return nRet;
}
-/**
-* @descr: Get column width
-* @param: the order of column
-*/
-double LwpLayout::GetColWidth(sal_uInt16 nIndex)
-{
- if((m_nOverrideFlag & OVER_COLUMNS)||(m_nAttributes2 & STYLE2_LOCALCOLUMNINFO))
- {
- LwpLayoutColumns* pLayColumns = dynamic_cast<LwpLayoutColumns*>(m_LayColumns.obj().get());
- if(pLayColumns)
- {
- return pLayColumns->GetColWidth(nIndex);
- }
- }
-
- rtl::Reference<LwpObject> xBase(GetBasedOnStyle());
- LwpVirtualLayout* pStyle = dynamic_cast<LwpVirtualLayout*>(xBase.get());
- if (pStyle)
- {
- return pStyle->GetColWidth(nIndex);
- }
-
- return LwpVirtualLayout::GetColWidth(nIndex);
-
-}
/**
* @descr: Get gap between columns
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index 98d7ca515906..1e07f4b1ae14 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -99,7 +99,6 @@ class LwpVirtualLayout : public LwpDLNFPVList
public:
LwpVirtualLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
virtual sal_uInt16 GetNumCols(){return 1;}
- virtual double GetColWidth(sal_uInt16 nIndex);
virtual double GetColGap(sal_uInt16 nIndex);
virtual bool IsAutoGrow(){ return false;}
virtual bool IsAutoGrowUp(){ return false;}
@@ -445,7 +444,6 @@ protected:
public:
LwpUseWhen* VirtualGetUseWhen() override;
virtual sal_uInt16 GetNumCols() override;
- virtual double GetColWidth(sal_uInt16 nIndex) override;
virtual double GetColGap(sal_uInt16 nIndex) override;
sal_uInt16 GetUsePage();
public:
diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx b/reportdesign/source/core/inc/ReportUndoFactory.hxx
index 7829022d4a6f..9334372d1056 100644
--- a/reportdesign/source/core/inc/ReportUndoFactory.hxx
+++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx
@@ -35,7 +35,6 @@ namespace rptui
virtual ~OReportUndoFactory() override;
// shapes
- virtual SdrUndoAction* CreateUndoMoveObject( SdrObject& rObject ) override;
virtual SdrUndoAction* CreateUndoMoveObject( SdrObject& rObject, const Size& rDist ) override;
virtual SdrUndoAction* CreateUndoGeoObject( SdrObject& rObject ) override;
virtual SdrUndoAction* CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1 = false, bool bSaveText = false ) override;
@@ -54,7 +53,6 @@ namespace rptui
// layer
virtual SdrUndoAction* CreateUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) override;
virtual SdrUndoAction* CreateUndoDeleteLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) override;
- virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNewPos1) override;
// page
virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage) override;
diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
index b574095953fb..750b9b7572ec 100644
--- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
+++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
@@ -50,12 +50,6 @@ OReportUndoFactory::~OReportUndoFactory()
{
}
-// shapes
-SdrUndoAction* OReportUndoFactory::CreateUndoMoveObject( SdrObject& rObject )
-{
- return m_pUndoFactory->CreateUndoMoveObject( rObject );
-}
-
SdrUndoAction* OReportUndoFactory::CreateUndoMoveObject( SdrObject& rObject, const Size& rDist )
{
return m_pUndoFactory->CreateUndoMoveObject( rObject, rDist );
@@ -127,11 +121,6 @@ SdrUndoAction* OReportUndoFactory::CreateUndoDeleteLayer(sal_uInt16 nLayerNum, S
return m_pUndoFactory->CreateUndoDeleteLayer( nLayerNum, rNewLayerAdmin, rNewModel );
}
-SdrUndoAction* OReportUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNewPos1)
-{
- return m_pUndoFactory->CreateUndoMoveLayer( nLayerNum, rNewLayerAdmin, rNewModel, nNewPos1 );
-}
-
// page
SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage)
{
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 4260968c75c0..a3ca67e793ab 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -55,7 +55,6 @@ public:
ScViewForwarder(ScTabViewShell* pViewShell, ScSplitPos eSplitPos, const ScAddress& rCell);
virtual bool IsValid() const override;
- virtual tools::Rectangle GetVisArea() const override;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override;
@@ -75,34 +74,6 @@ bool ScViewForwarder::IsValid() const
return mpViewShell != nullptr;
}
-tools::Rectangle ScViewForwarder::GetVisArea() const
-{
- tools::Rectangle aVisArea;
- if (mpViewShell)
- {
- vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos);
- if (pWindow)
- {
- aVisArea.SetSize(pWindow->GetSizePixel());
-
- ScHSplitPos eWhichH = ((meSplitPos == SC_SPLIT_TOPLEFT) || (meSplitPos == SC_SPLIT_BOTTOMLEFT)) ?
- SC_SPLIT_LEFT : SC_SPLIT_RIGHT;
- ScVSplitPos eWhichV = ((meSplitPos == SC_SPLIT_TOPLEFT) || (meSplitPos == SC_SPLIT_TOPRIGHT)) ?
- SC_SPLIT_TOP : SC_SPLIT_BOTTOM;
-
- Point aBaseCellPos(mpViewShell->GetViewData().GetScrPos(mpViewShell->GetViewData().GetPosX(eWhichH),
- mpViewShell->GetViewData().GetPosY(eWhichV), meSplitPos, true));
- Point aCellPos(mpViewShell->GetViewData().GetScrPos(maCellPos.Col(), maCellPos.Row(), meSplitPos, true));
- aVisArea.SetPos(aCellPos - aBaseCellPos);
- }
- }
- else
- {
- OSL_FAIL("this ViewForwarder is not valid");
- }
- return aVisArea;
-}
-
Point ScViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const
{
if (mpViewShell)
@@ -148,7 +119,6 @@ public:
const EditView* _pEditView);
virtual bool IsValid() const override;
- virtual tools::Rectangle GetVisArea() const override;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override;
@@ -168,24 +138,6 @@ bool ScEditObjectViewForwarder::IsValid() const
return (mpWindow != nullptr);
}
-tools::Rectangle ScEditObjectViewForwarder::GetVisArea() const
-{
- tools::Rectangle aVisArea;
- if (mpWindow)
- {
- tools::Rectangle aVisRect(mpWindow->GetWindowExtentsRelative(mpWindow->GetAccessibleParentWindow()));
-
- aVisRect.SetPos(Point(0, 0));
-
- aVisArea = aVisRect;
- }
- else
- {
- OSL_FAIL("this ViewForwarder is not valid");
- }
- return aVisArea;
-}
-
Point ScEditObjectViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const
{
if (mpWindow)
@@ -241,16 +193,10 @@ public:
explicit ScPreviewViewForwarder(ScPreviewShell* pViewShell);
virtual bool IsValid() const override;
- virtual tools::Rectangle GetVisArea() const override;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override;
void SetInvalid();
-
- tools::Rectangle GetVisRect() const;
-
- // clips the VisArea and calculates with the negative coordinates
- tools::Rectangle CorrectVisArea(const tools::Rectangle& rVisArea) const;
};
ScPreviewViewForwarder::ScPreviewViewForwarder(ScPreviewShell* pViewShell)
@@ -263,12 +209,6 @@ bool ScPreviewViewForwarder::IsValid() const
return mpViewShell != nullptr;
}
-tools::Rectangle ScPreviewViewForwarder::GetVisArea() const
-{
- OSL_FAIL("should be implemented in an abrevated class");
- return tools::Rectangle();
-}
-
Point ScPreviewViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const
{
if (mpViewShell)
@@ -316,79 +256,16 @@ void ScPreviewViewForwarder::SetInvalid()
mpViewShell = nullptr;
}
-tools::Rectangle ScPreviewViewForwarder::GetVisRect() const
-{
- if ( mpViewShell )
- {
- Size aOutputSize;
- vcl::Window* pWindow = mpViewShell->GetWindow();
- if ( pWindow )
- aOutputSize = pWindow->GetOutputSizePixel();
- tools::Rectangle aVisRect( Point(), aOutputSize );
- return aVisRect;
- }
- return tools::Rectangle();
-}
-
-tools::Rectangle ScPreviewViewForwarder::CorrectVisArea(const tools::Rectangle& rVisArea) const
-{
- tools::Rectangle aVisArea(rVisArea);
- Point aPos = aVisArea.TopLeft(); // get first the position to remember negative positions after clipping
-
- vcl::Window* pWin = mpViewShell->GetWindow();
- if (pWin)
- aVisArea = pWin->GetWindowExtentsRelative(pWin).GetIntersection(aVisArea);
-
- sal_Int32 nX(aPos.getX());
- sal_Int32 nY(aPos.getY());
-
- if (nX > 0)
- nX = 0;
- else if (nX < 0)
- nX = -nX;
- if (nY > 0)
- nY = 0;
- else if (nY < 0)
- nY = -nY;
- aVisArea.SetPos(Point(nX, nY));
-
- return aVisArea;
-}
-
class ScPreviewHeaderFooterViewForwarder : public ScPreviewViewForwarder
{
- bool mbHeader;
public:
- ScPreviewHeaderFooterViewForwarder(ScPreviewShell* pViewShell, bool bHeader);
-
- virtual tools::Rectangle GetVisArea() const override;
+ ScPreviewHeaderFooterViewForwarder(ScPreviewShell* pViewShell);
};
-ScPreviewHeaderFooterViewForwarder::ScPreviewHeaderFooterViewForwarder(ScPreviewShell* pViewShell, bool bHeader)
+ScPreviewHeaderFooterViewForwarder::ScPreviewHeaderFooterViewForwarder(ScPreviewShell* pViewShell)
:
- ScPreviewViewForwarder(pViewShell),
- mbHeader(bHeader)
-{
-}
-
-tools::Rectangle ScPreviewHeaderFooterViewForwarder::GetVisArea() const
+ ScPreviewViewForwarder(pViewShell)
{
- tools::Rectangle aVisArea;
- if (mpViewShell)
- {
- const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
- if ( mbHeader )
- rData.GetHeaderPosition( aVisArea );
- else
- rData.GetFooterPosition( aVisArea );
-
- aVisArea = CorrectVisArea(aVisArea);
- }
- else
- {
- OSL_FAIL("this ViewForwarder is not valid");
- }
- return aVisArea;
}
class ScPreviewCellViewForwarder : public ScPreviewViewForwarder
@@ -397,8 +274,6 @@ class ScPreviewCellViewForwarder : public ScPreviewViewForwarder
public:
ScPreviewCellViewForwarder(ScPreviewShell* pViewShell,
const ScAddress& aCellPos);
-
- virtual tools::Rectangle GetVisArea() const override;
};
ScPreviewCellViewForwarder::ScPreviewCellViewForwarder(ScPreviewShell* pViewShell,
@@ -409,99 +284,36 @@ ScPreviewCellViewForwarder::ScPreviewCellViewForwarder(ScPreviewShell* pViewShel
{
}
-tools::Rectangle ScPreviewCellViewForwarder::GetVisArea() const
-{
- tools::Rectangle aVisArea;
- if (mpViewShell)
- {
- const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
- aVisArea = rData.GetCellOutputRect(maCellPos);
-
- aVisArea = CorrectVisArea(aVisArea);
- }
- else
- {
- OSL_FAIL("this ViewForwarder is not valid");
- }
- return aVisArea;
-}
-
class ScPreviewHeaderCellViewForwarder : public ScPreviewViewForwarder
{
ScAddress maCellPos;
- bool mbColHeader;
public:
ScPreviewHeaderCellViewForwarder(ScPreviewShell* pViewShell,
- const ScAddress& aCellPos,
- bool bColHeader);
-
- virtual tools::Rectangle GetVisArea() const override;
+ const ScAddress& aCellPos);
};
ScPreviewHeaderCellViewForwarder::ScPreviewHeaderCellViewForwarder(ScPreviewShell* pViewShell,
- const ScAddress& aCellPos,
- bool bColHeader)
+ const ScAddress& aCellPos)
:
ScPreviewViewForwarder(pViewShell),
- maCellPos(aCellPos),
- mbColHeader(bColHeader)
+ maCellPos(aCellPos)
{
}
-tools::Rectangle ScPreviewHeaderCellViewForwarder::GetVisArea() const
-{
- tools::Rectangle aVisArea;
- if (mpViewShell)
- {
- const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
- aVisArea = rData.GetHeaderCellOutputRect(GetVisRect(), maCellPos, mbColHeader);
-
- aVisArea = CorrectVisArea(aVisArea);
- }
- else
- {
- OSL_FAIL("this ViewForwarder is not valid");
- }
- return aVisArea;
-}
-
class ScPreviewNoteViewForwarder : public ScPreviewViewForwarder
{
ScAddress maCellPos;
- bool mbNoteMark;
public:
ScPreviewNoteViewForwarder(ScPreviewShell* pViewShell,
- const ScAddress& aCellPos,
- bool bNoteMark);
-
- virtual tools::Rectangle GetVisArea() const override;
+ const ScAddress& aCellPos);
};
ScPreviewNoteViewForwarder::ScPreviewNoteViewForwarder(ScPreviewShell* pViewShell,
- const ScAddress& aCellPos,
- bool bNoteMark)
+ const ScAddress& aCellPos)
:
ScPreviewViewForwarder(pViewShell),
- maCellPos(aCellPos),
- mbNoteMark(bNoteMark)
-{
-}
-
-tools::Rectangle ScPreviewNoteViewForwarder::GetVisArea() const
+ maCellPos(aCellPos)
{
- tools::Rectangle aVisArea;
- if (mpViewShell)
- {
- const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
- aVisArea = rData.GetNoteInRangeOutputRect(GetVisRect(), mbNoteMark, maCellPos);
-
- aVisArea = CorrectVisArea(aVisArea);
- }
- else
- {
- OSL_FAIL("this ViewForwarder is not valid");
- }
- return aVisArea;
}
class ScEditViewForwarder : public SvxEditViewForwarder
@@ -512,7 +324,6 @@ public:
ScEditViewForwarder(EditView* pEditView, vcl::Window* pWin);
virtual bool IsValid() const override;
- virtual tools::Rectangle GetVisArea() const override;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override;
virtual bool GetSelection( ESelection& rSelection ) const override;
@@ -535,22 +346,6 @@ bool ScEditViewForwarder::IsValid() const
return mpWindow && mpEditView;
}
-tools::Rectangle ScEditViewForwarder::GetVisArea() const
-{
- tools::Rectangle aVisArea;
- if (IsValid() && mpEditView->GetEditEngine())
- {
- MapMode aMapMode(mpEditView->GetEditEngine()->GetRefMapMode());
-
- aVisArea = mpWindow->LogicToPixel( mpEditView->GetVisArea(), aMapMode );
- }
- else
- {
- OSL_FAIL("this EditViewForwarder is no longer valid");
- }
- return aVisArea;
-}
-
Point ScEditViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const
{
if (mpWindow)
@@ -1281,7 +1076,7 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::GetTextForwarder()
SvxViewForwarder* ScAccessiblePreviewHeaderCellTextData::GetViewForwarder()
{
if (!mpViewForwarder)
- mpViewForwarder.reset(new ScPreviewHeaderCellViewForwarder(mpViewShell, aCellPos, mbColHeader));
+ mpViewForwarder.reset(new ScPreviewHeaderCellViewForwarder(mpViewShell, aCellPos));
return mpViewForwarder.get();
}
@@ -1400,7 +1195,7 @@ SvxTextForwarder* ScAccessibleHeaderTextData::GetTextForwarder()
SvxViewForwarder* ScAccessibleHeaderTextData::GetViewForwarder()
{
if (!mpViewForwarder)
- mpViewForwarder = new ScPreviewHeaderFooterViewForwarder(mpViewShell, mbHeader);
+ mpViewForwarder = new ScPreviewHeaderFooterViewForwarder(mpViewShell);
return mpViewForwarder;
}
@@ -1503,7 +1298,7 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder()
SvxViewForwarder* ScAccessibleNoteTextData::GetViewForwarder()
{
if (!mpViewForwarder)
- mpViewForwarder = new ScPreviewNoteViewForwarder(mpViewShell, maCellPos, mbMarkNote);
+ mpViewForwarder = new ScPreviewNoteViewForwarder(mpViewShell, maCellPos);
return mpViewForwarder;
}
@@ -1518,7 +1313,6 @@ public:
explicit ScCsvViewForwarder( vcl::Window* pWindow, const tools::Rectangle& rBoundBox );
virtual bool IsValid() const override;
- virtual tools::Rectangle GetVisArea() const override;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override;
@@ -1536,11 +1330,6 @@ bool ScCsvViewForwarder::IsValid() const
return mpWindow != nullptr;
}
-tools::Rectangle ScCsvViewForwarder::GetVisArea() const
-{
- return maBoundBox;
-}
-
Point ScCsvViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const
{
if( !mpWindow ) return Point();
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index a1cc279398f7..d06c28843502 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2718,19 +2718,6 @@ bool ScDocShell::PrepareClose( bool bUI )
return bRet;
}
-void ScDocShell::PrepareReload()
-{
- SfxObjectShell::PrepareReload(); // FIXME: Doesn't do a thing?
-
- // The Disconnect of DDE Links can trigger a Reschedule.
- // If the DDE Links are not deleted before the Document dtor,
- // the DDE Link Update for this Document can be triggered from this Reschedule on Reload.
- // This causes a hang.
- //
- // Thus: Disconnect the DDE Links of the old Document before Reload
- m_aDocument.GetDocLinkManager().disconnectDdeLinks();
-}
-
OUString ScDocShell::GetOwnFilterName()
{
return OUString(pFilterSc50);
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index fe8dac8a1ef5..c31eacb566b9 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -202,7 +202,6 @@ public:
virtual bool SaveAs( SfxMedium& rMedium ) override;
virtual bool ConvertTo( SfxMedium &rMedium ) override;
virtual bool PrepareClose( bool bUI = true ) override;
- virtual void PrepareReload() override;
virtual void LoadStyles( SfxObjectShell &rSource ) override;
virtual bool DoSaveCompleted( SfxMedium * pNewStor=nullptr, bool bRegisterRecent=true ) override; // SfxObjectShell
diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx
index 08ca695e4d6d..274be099b4b9 100644
--- a/sc/source/ui/vba/vbacondition.cxx
+++ b/sc/source/ui/vba/vbacondition.cxx
@@ -92,20 +92,6 @@ ScVbaCondition< Ifc... >::Formula2( )
}
template< typename... Ifc >
-void
-ScVbaCondition< Ifc... >::setFormula1( const uno::Any& _aFormula1)
-{
- OUString sFormula;
- if ( _aFormula1 >>= sFormula )
- {
- mxSheetCondition->setFormula1( sFormula );
- table::CellRangeAddress aCellRangeAddress = mxAddressable->getRangeAddress();
- table::CellAddress aCellAddress( aCellRangeAddress.Sheet, aCellRangeAddress.StartColumn, aCellRangeAddress.StartRow );
- mxSheetCondition->setSourcePosition(aCellAddress);
- }
-}
-
-template< typename... Ifc >
sal_Int32
ScVbaCondition< Ifc... >::Operator(bool _bIncludeFormulaValue)
{
diff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxx
index 7757eb5d06b5..346905a8c2c4 100644
--- a/sc/source/ui/vba/vbacondition.hxx
+++ b/sc/source/ui/vba/vbacondition.hxx
@@ -39,8 +39,6 @@ public:
virtual OUString SAL_CALL Formula1( ) override;
virtual OUString SAL_CALL Formula2( ) override;
/// @throws css::script::BasicErrorException
- virtual void setFormula1( const css::uno::Any& _aFormula1);
- /// @throws css::script::BasicErrorException
virtual sal_Int32 Operator(bool _bIncludeFormulaValue);
virtual sal_Int32 SAL_CALL Operator() override = 0;
diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx
index 55d81e888030..b32a922a5402 100644
--- a/sc/source/ui/vba/vbaformatcondition.cxx
+++ b/sc/source/ui/vba/vbaformatcondition.cxx
@@ -109,14 +109,6 @@ ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference<
return aAPIType;
}
-void
-ScVbaFormatCondition::setFormula1( const uno::Any& _aFormula1)
-{
- // getA1Formula *SHOULD* detect whether the formula is r1c1 or A1 syntax
- // and if R1C1 convert to A1
- ScVbaFormatCondition_BASE::setFormula1( uno::makeAny( ScVbaFormatConditions::getA1Formula(_aFormula1) ) );
-}
-
::sal_Int32 SAL_CALL
ScVbaFormatCondition::Type( )
{
diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx
index 78ea75783314..892f6eb6e74e 100644
--- a/sc/source/ui/vba/vbaformatcondition.hxx
+++ b/sc/source/ui/vba/vbaformatcondition.hxx
@@ -58,7 +58,6 @@ public:
virtual ::sal_Int32 SAL_CALL Type( ) override;
using ScVbaFormatCondition_BASE::Operator;
virtual ::sal_Int32 SAL_CALL Operator( ) override;
- virtual void setFormula1( const css::uno::Any& _aFormula1) override;
virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior( ) override;
virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) override;
virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) override;
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index e8d0d639a01c..8cec945cccaf 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -196,7 +196,6 @@ public:
/** Also override ReplaceObject methods to realize when
objects are removed with this mechanism instead of RemoveObject*/
- virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum) override;
virtual SdrObject* ReplaceObject(SdrObject* pNewObj, size_t nObjNum) override;
void SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const OUString& rStr );
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index e8e0842e00c7..83bce2472c58 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -131,8 +131,6 @@ private:
/// @throws css::uno::RuntimeException
static const SfxItemPropertySimpleEntry* getPropertyMapEntry( const OUString& rPropertyName );
- virtual void Load (SvStream& rIn, sal_uInt16 nVersion) override;
-
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
virtual ~SdStyleSheet() override;
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 5b65ce98bcf9..6a86108e47b2 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1715,14 +1715,6 @@ SdrObject* SdPage::NbcRemoveObject(size_t nObjNum)
// Also override ReplaceObject methods to realize when
// objects are removed with this mechanism instead of RemoveObject
-SdrObject* SdPage::NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum)
-{
- onRemoveObject(GetObj( nObjNum ));
- return FmFormPage::NbcReplaceObject(pNewObj, nObjNum);
-}
-
-// Also override ReplaceObject methods to realize when
-// objects are removed with this mechanism instead of RemoveObject
SdrObject* SdPage::ReplaceObject(SdrObject* pNewObj, size_t nObjNum)
{
onRemoveObject(GetObj( nObjNum ));
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 2ee00f3c0c69..c2470057c251 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -160,17 +160,6 @@ OUString const & SdStyleSheet::GetApiName() const
return GetName();
}
-void SdStyleSheet::Load (SvStream& rIn, sal_uInt16 nVersion)
-{
- SfxStyleSheetBase::Load(rIn, nVersion);
-
- /* previously, the default mask was 0xAFFE. The needed flags were masked
- from this mask. Now the flag SfxStyleSearchBits::ReadOnly was introduced and with
- this, all style sheets are read only. Since no style sheet should be read
- only in Draw, we reset the flag here. */
- nMask &= ~SfxStyleSearchBits::ReadOnly;
-}
-
bool SdStyleSheet::SetParent(const OUString& rParentName)
{
bool bResult = false;
diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
index 703aeedbd6a8..ea004a876ccb 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
@@ -121,26 +121,6 @@ namespace accessibility
return false;
}
- ::tools::Rectangle AccessibleOutlineEditSource::GetVisArea() const
- {
- if( IsValid() )
- {
- SdrPaintWindow* pPaintWindow = mrView.FindPaintWindow(mrWindow);
- ::tools::Rectangle aVisArea;
-
- if(pPaintWindow)
- {
- aVisArea = pPaintWindow->GetVisibleArea();
- }
-
- MapMode aMapMode(mrWindow.GetMapMode());
- aMapMode.SetOrigin(Point());
- return mrWindow.LogicToPixel( aVisArea, aMapMode );
- }
-
- return ::tools::Rectangle();
- }
-
Point AccessibleOutlineEditSource::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const
{
if( IsValid() && mrView.GetModel() )
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 4bc7339b037e..ef981118f6d3 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -341,51 +341,6 @@ void DrawDocShell::GetState(SfxItemSet &rSet)
}
}
-void DrawDocShell::InPlaceActivate( bool bActive )
-{
- SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(this, false);
- std::vector<std::unique_ptr<FrameView>> &rViews = mpDoc->GetFrameViewList();
-
- if( !bActive )
- {
- rViews.clear();
-
- while (pSfxViewFrame)
- {
- // determine the number of FrameViews
- SfxViewShell* pSfxViewSh = pSfxViewFrame->GetViewShell();
- ViewShell* pViewSh = dynamic_cast<ViewShell*>(pSfxViewSh);
-
- if ( pViewSh && pViewSh->GetFrameView() )
- {
- pViewSh->WriteFrameViewData();
- rViews.push_back( o3tl::make_unique<FrameView>( mpDoc, pViewSh->GetFrameView() ) );
- }
-
- pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, false);
- }
- }
-
- SfxObjectShell::InPlaceActivate( bActive );
-
- if( bActive )
- {
- for( std::vector<FrameView*>::size_type i = 0; pSfxViewFrame && (i < rViews.size()); i++ )
- {
- // determine the number of FrameViews
- SfxViewShell* pSfxViewSh = pSfxViewFrame->GetViewShell();
- ViewShell* pViewSh = dynamic_cast<ViewShell*>(pSfxViewSh);
-
- if ( pViewSh )
- {
- pViewSh->ReadFrameViewData( rViews[ i ].get() );
- }
-
- pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, false);
- }
- }
-}
-
void DrawDocShell::Activate( bool bMDI)
{
if (bMDI)
diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
index 8bceeae7878d..f177d05143f3 100644
--- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
+++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
@@ -63,7 +63,6 @@ namespace accessibility
// the view forwarder
virtual bool IsValid() const override;
- virtual ::tools::Rectangle GetVisArea() const override;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override;
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index b11af639a4a4..0c73fdadbc89 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -221,7 +221,6 @@ protected:
bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor
void Construct(bool bClipboard);
- virtual void InPlaceActivate( bool bActive ) override;
private:
static void setEditMode(DrawViewShell* pDrawViewShell, bool isMasterPage);
};
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 1340d2711624..4619b7035234 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -180,7 +180,6 @@ public:
virtual bool HasMarkablePoints() const override;
virtual sal_Int32 GetMarkablePointCount() const override;
virtual bool HasMarkedPoints() const override;
- virtual sal_Int32 GetMarkedPointCount() const override;
virtual bool IsPointMarkable(const SdrHdl& rHdl) const override;
virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false) override;
virtual void CheckPossibilities() override;
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index c0659cc7bf07..5d753fe4aaa5 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -1144,13 +1144,6 @@ bool View::HasMarkedPoints() const
return FmFormView::HasMarkedPoints();
}
-sal_Int32 View::GetMarkedPointCount() const
-{
- sal_Int32 nCount = FmFormView::GetMarkedPointCount();
- nCount += maSmartTags.GetMarkedPointCount();
- return nCount;
-}
-
bool View::IsPointMarkable(const SdrHdl& rHdl) const
{
if( SmartTagSet::IsPointMarkable( rHdl ) )
diff --git a/sdext/source/pdfimport/inc/genericelements.hxx b/sdext/source/pdfimport/inc/genericelements.hxx
index 59defa1588e7..416c02b36cc7 100644
--- a/sdext/source/pdfimport/inc/genericelements.hxx
+++ b/sdext/source/pdfimport/inc/genericelements.hxx
@@ -254,7 +254,6 @@ namespace pdfi
virtual void visitedBy( ElementTreeVisitor&, const std::list< std::unique_ptr<Element> >::const_iterator& rParentIt ) override;
- static void updateParagraphGeometry( Element* pEle );
void resolveHyperlinks();
void resolveFontStyles( PDFIProcessor const & rProc );
void resolveUnderlines( PDFIProcessor const & rProc );
diff --git a/sdext/source/pdfimport/tree/genericelements.cxx b/sdext/source/pdfimport/tree/genericelements.cxx
index 410b371134a8..d4eb7dcc34d8 100644
--- a/sdext/source/pdfimport/tree/genericelements.cxx
+++ b/sdext/source/pdfimport/tree/genericelements.cxx
@@ -265,36 +265,6 @@ void PageElement::visitedBy( ElementTreeVisitor& rVisit
rVisitor.visit(*this, rParentIt);
}
-void PageElement::updateParagraphGeometry( Element* pEle )
-{
- // update geometry of children
- for( auto it = pEle->Children.begin();
- it != pEle->Children.end(); ++it )
- {
- updateParagraphGeometry( it->get() );
- }
- // if this is a paragraph itself, then update according to children geometry
- if( dynamic_cast<ParagraphElement*>(pEle) )
- {
- for( auto it = pEle->Children.begin();
- it != pEle->Children.end(); ++it )
- {
- Element* pChild = nullptr;
- TextElement* pText = dynamic_cast<TextElement*>(it->get());
- if( pText )
- pChild = pText;
- else
- {
- ParagraphElement* pPara = dynamic_cast<ParagraphElement*>(it->get());
- if( pPara )
- pChild = pPara;
- }
- if( pChild )
- pEle->updateGeometryWith( pChild );
- }
- }
-}
-
bool PageElement::resolveHyperlink( const std::list<std::unique_ptr<Element>>::iterator& link_it, std::list<std::unique_ptr<Element>>& rElements )
{
HyperlinkElement* pLink = dynamic_cast<HyperlinkElement*>(link_it->get());
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 202790988e62..f96947d94970 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -897,13 +897,6 @@ void SfxObjectShell::SetActivateEvent_Impl(SfxEventHintId nId )
pImpl->nEventId = nId;
}
-void SfxObjectShell::PrepareReload( )
-/*
- Is called before the Reload and gives the opportunity to clear any caches.
-*/
-{
-}
-
bool SfxObjectShell::IsAutoLoadLocked() const
/* Returns whether an Autoload is allowed to be executed. Before the
@@ -1647,10 +1640,6 @@ bool SfxObjectShell::IsUIActive()
return pFrame && pFrame->GetFrame().IsInPlace() && pFrame->GetFrame().GetWorkWindow_Impl()->IsVisible_Impl();
}
-void SfxObjectShell::InPlaceActivate( bool )
-{
-}
-
bool SfxObjectShell::UseInteractionToHandleError(
const uno::Reference< task::XInteractionHandler >& xHandler,
ErrCode nError )
diff --git a/slideshow/source/engine/shapeattributelayer.cxx b/slideshow/source/engine/shapeattributelayer.cxx
index f766707b696b..937ed1508fb0 100644
--- a/slideshow/source/engine/shapeattributelayer.cxx
+++ b/slideshow/source/engine/shapeattributelayer.cxx
@@ -650,14 +650,6 @@ namespace slideshow
return mbCharRotationAngleValid || ( haveChild() && mpChild->isCharRotationAngleValid() );
}
- double ShapeAttributeLayer::getCharRotationAngle() const
- {
- return calcValue( mnCharRotationAngle,
- mbCharRotationAngleValid,
- &ShapeAttributeLayer::isCharRotationAngleValid,
- &ShapeAttributeLayer::getCharRotationAngle );
- }
-
void ShapeAttributeLayer::setCharRotationAngle( const double& rNewAngle )
{
ENSURE_OR_THROW( ::rtl::math::isFinite(rNewAngle),
diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx
index 27ed2c1ae22d..024a1cc88f41 100644
--- a/slideshow/source/inc/shapeattributelayer.hxx
+++ b/slideshow/source/inc/shapeattributelayer.hxx
@@ -378,11 +378,7 @@ namespace slideshow
/** Query whether the char rotation angle attribute is valid
*/
bool isCharRotationAngleValid() const;
- /** Query the current text rotation angle of the shape
- @return the text rotation angle in degrees.
- */
- double getCharRotationAngle() const;
/** Set the new text rotation angle of the shape
@param rNewAngle
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 6477e6095357..b97dc5a5a6aa 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -807,32 +807,6 @@ bool SmViewForwarder::IsValid() const
return rEditAcc.GetEditView() != nullptr;
}
-tools::Rectangle SmViewForwarder::GetVisArea() const
-{
- EditView *pEditView = rEditAcc.GetEditView();
- OutputDevice* pOutDev = pEditView ? pEditView->GetWindow() : nullptr;
-
- if( pOutDev && pEditView)
- {
- tools::Rectangle aVisArea = pEditView->GetVisArea();
-
- // figure out map mode from edit engine
- EditEngine* pEditEngine = pEditView->GetEditEngine();
-
- if( pEditEngine )
- {
- MapMode aMapMode(pOutDev->GetMapMode());
- aVisArea = OutputDevice::LogicToLogic( aVisArea,
- pEditEngine->GetRefMapMode(),
- MapMode(aMapMode.GetMapUnit()));
- aMapMode.SetOrigin(Point());
- return pOutDev->LogicToPixel( aVisArea, aMapMode );
- }
- }
-
- return tools::Rectangle();
-}
-
Point SmViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const
{
EditView *pEditView = rEditAcc.GetEditView();
@@ -1412,33 +1386,6 @@ bool SmEditViewForwarder::IsValid() const
return rEditAcc.GetEditView() != nullptr;
}
-tools::Rectangle SmEditViewForwarder::GetVisArea() const
-{
- tools::Rectangle aRect(0,0,0,0);
-
- EditView *pEditView = rEditAcc.GetEditView();
- OutputDevice* pOutDev = pEditView ? pEditView->GetWindow() : nullptr;
-
- if( pOutDev && pEditView)
- {
- tools::Rectangle aVisArea = pEditView->GetVisArea();
-
- // figure out map mode from edit engine
- EditEngine* pEditEngine = pEditView->GetEditEngine();
-
- if( pEditEngine )
- {
- MapMode aMapMode(pOutDev->GetMapMode());
- aVisArea = OutputDevice::LogicToLogic( aVisArea,
- pEditEngine->GetRefMapMode(),
- MapMode(aMapMode.GetMapUnit()));
- aMapMode.SetOrigin(Point());
- aRect = pOutDev->LogicToPixel( aVisArea, aMapMode );
- }
- }
-
- return aRect;
-}
Point SmEditViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const
{
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 9c669e51f177..8723d61e9309 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -161,7 +161,6 @@ public:
virtual ~SmViewForwarder() override;
virtual bool IsValid() const override;
- virtual tools::Rectangle GetVisArea() const override;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override;
};
@@ -250,7 +249,6 @@ public:
virtual bool IsValid() const override;
- virtual tools::Rectangle GetVisArea() const override;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override;
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 53297366aa95..3517c68cd718 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -835,10 +835,6 @@ void SfxStyleSheetBasePool::ChangeParent(const OUString& rOld,
SetSearchMask(GetSearchFamily(), nTmpMask);
}
-void SfxStyleSheetBase::Load( SvStream&, sal_uInt16 )
-{
-}
-
SfxStyleSheet::SfxStyleSheet(const OUString &rName,
const SfxStyleSheetBasePool& r_Pool,
SfxStyleFamily eFam,
diff --git a/svx/inc/sdr/contact/objectcontactofpageview.hxx b/svx/inc/sdr/contact/objectcontactofpageview.hxx
index 5a73731e12be..4fb0bef53898 100644
--- a/svx/inc/sdr/contact/objectcontactofpageview.hxx
+++ b/svx/inc/sdr/contact/objectcontactofpageview.hxx
@@ -76,9 +76,6 @@ namespace sdr
// this ObjectContact.
virtual void InvalidatePartOfView(const basegfx::B2DRange& rRange) const override;
- // Get info if given Rectangle is visible in this view
- virtual bool IsAreaVisible(const basegfx::B2DRange& rRange) const override;
-
// Get info about the need to visualize GluePoints. The default
// is that it is not necessary.
virtual bool AreGluePointsVisible() const override;
@@ -92,12 +89,6 @@ namespace sdr
// print? Default is false
virtual bool isOutputToPrinter() const override;
- // window? Default is true
- virtual bool isOutputToWindow() const override;
-
- // VirtualDevice? Default is false
- virtual bool isOutputToVirtualDevice() const override;
-
// recording MetaFile? Default is false
virtual bool isOutputToRecordingMetaFile() const override;
@@ -107,9 +98,6 @@ namespace sdr
// gray display mode
virtual bool isDrawModeGray() const override;
- // gray display mode
- virtual bool isDrawModeBlackWhite() const override;
-
// high contrast display mode
virtual bool isDrawModeHighContrast() const override;
diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
index 0e7d6b489564..1970131c75ee 100644
--- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
@@ -67,9 +67,6 @@ namespace sdr
// flush. Do buffered updates.
virtual void flush() override;
- // restore part of background. Implemented form buffered versions only.
- virtual void restoreBackground(const vcl::Region& rRegion) const override;
-
// invalidate the given range at local OutputDevice
virtual void invalidateRange(const basegfx::B2DRange& rRange) override;
};
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index 0b87947ce329..804b208b59aa 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -158,7 +158,6 @@ namespace accessibility
sal_Int16 GetDepth( sal_Int32 ) const override { return -1; }
bool SetDepth( sal_Int32, sal_Int16 ) override { return true; }
- tools::Rectangle GetVisArea() const override { return tools::Rectangle(); }
Point LogicToPixel( const Point& rPoint, const MapMode& /*rMapMode*/ ) const override { return rPoint; }
Point PixelToLogic( const Point& rPoint, const MapMode& /*rMapMode*/ ) const override { return rPoint; }
diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx
index 9bcd586acf7f..a4d52073dfa1 100644
--- a/svx/source/sdr/contact/objectcontact.cxx
+++ b/svx/source/sdr/contact/objectcontact.cxx
@@ -121,13 +121,6 @@ void ObjectContact::InvalidatePartOfView(const basegfx::B2DRange& /*rRange*/) co
// nothing to do here in the default version
}
-// Get info if given Rectangle is visible in this view
-bool ObjectContact::IsAreaVisible(const basegfx::B2DRange& /*rRange*/) const
-{
- // always visible in default version
- return true;
-}
-
// Get info about the need to visualize GluePoints
bool ObjectContact::AreGluePointsVisible() const
{
@@ -160,18 +153,6 @@ bool ObjectContact::isOutputToPrinter() const
return false;
}
-// window? Default is true
-bool ObjectContact::isOutputToWindow() const
-{
- return true;
-}
-
-// VirtualDevice? Default is false
-bool ObjectContact::isOutputToVirtualDevice() const
-{
- return false;
-}
-
// recording MetaFile? Default is false
bool ObjectContact::isOutputToRecordingMetaFile() const
{
@@ -190,12 +171,6 @@ bool ObjectContact::isDrawModeGray() const
return false;
}
-// gray display mode
-bool ObjectContact::isDrawModeBlackWhite() const
-{
- return false;
-}
-
// high contrast display mode
bool ObjectContact::isDrawModeHighContrast() const
{
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index 71ab1bb83a10..2e89227ff93d 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -128,12 +128,6 @@ void ObjectContactOfObjListPainter::ProcessDisplay(DisplayInfo& rDisplayInfo)
}
}
-// VirtualDevice?
-bool ObjectContactOfObjListPainter::isOutputToVirtualDevice() const
-{
- return (OUTDEV_VIRDEV == mrTargetOutputDevice.GetOutDevType());
-}
-
// recording MetaFile?
bool ObjectContactOfObjListPainter::isOutputToRecordingMetaFile() const
{
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 19b28b9488d0..e4b4b6ca1de9 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -354,33 +354,6 @@ namespace sdr
GetPageWindow().InvalidatePageWindow(rRange);
}
- // Get info if given Rectangle is visible in this view
- bool ObjectContactOfPageView::IsAreaVisible(const basegfx::B2DRange& rRange) const
- {
- // compare with the visible rectangle
- if(rRange.isEmpty())
- {
- // no range -> not visible
- return false;
- }
- else
- {
- const OutputDevice& rTargetOutDev = GetPageWindow().GetPaintWindow().GetTargetOutputDevice();
- const Size aOutputSizePixel(rTargetOutDev.GetOutputSizePixel());
- basegfx::B2DRange aLogicViewRange(0.0, 0.0, aOutputSizePixel.getWidth(), aOutputSizePixel.getHeight());
-
- aLogicViewRange.transform(rTargetOutDev.GetInverseViewTransformation());
-
- if(!aLogicViewRange.isEmpty() && !aLogicViewRange.overlaps(rRange))
- {
- return false;
- }
- }
-
- // call parent
- return ObjectContact::IsAreaVisible(rRange);
- }
-
// Get info about the need to visualize GluePoints
bool ObjectContactOfPageView::AreGluePointsVisible() const
{
@@ -413,18 +386,6 @@ namespace sdr
return (OUTDEV_PRINTER == mrPageWindow.GetPaintWindow().GetOutputDevice().GetOutDevType());
}
- // window?
- bool ObjectContactOfPageView::isOutputToWindow() const
- {
- return (OUTDEV_WINDOW == mrPageWindow.GetPaintWindow().GetOutputDevice().GetOutDevType());
- }
-
- // VirtualDevice?
- bool ObjectContactOfPageView::isOutputToVirtualDevice() const
- {
- return (OUTDEV_VIRDEV == mrPageWindow.GetPaintWindow().GetOutputDevice().GetOutDevType());
- }
-
// recording MetaFile?
bool ObjectContactOfPageView::isOutputToRecordingMetaFile() const
{
@@ -445,13 +406,6 @@ namespace sdr
return (nDrawMode == (DrawModeFlags::GrayLine|DrawModeFlags::GrayFill|DrawModeFlags::BlackText|DrawModeFlags::GrayBitmap|DrawModeFlags::GrayGradient));
}
- // gray display mode
- bool ObjectContactOfPageView::isDrawModeBlackWhite() const
- {
- const DrawModeFlags nDrawMode(mrPageWindow.GetPaintWindow().GetOutputDevice().GetDrawMode());
- return (nDrawMode == (DrawModeFlags::BlackLine|DrawModeFlags::BlackText|DrawModeFlags::WhiteFill|DrawModeFlags::GrayBitmap|DrawModeFlags::WhiteGradient));
- }
-
// high contrast display mode
bool ObjectContactOfPageView::isDrawModeHighContrast() const
{
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index e22cbc184891..3a01278f2e1b 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -64,12 +64,9 @@ public:
// forward access to SdrPageView of ViewObjectContactOfPageObj
virtual bool isOutputToPrinter() const override;
- virtual bool isOutputToWindow() const override;
- virtual bool isOutputToVirtualDevice() const override;
virtual bool isOutputToRecordingMetaFile() const override;
virtual bool isOutputToPDFFile() const override;
virtual bool isDrawModeGray() const override;
- virtual bool isDrawModeBlackWhite() const override;
virtual bool isDrawModeHighContrast() const override;
virtual SdrPageView* TryToGetSdrPageView() const override;
virtual OutputDevice* TryToGetOutputDevice() const override;
@@ -177,12 +174,9 @@ void PagePrimitiveExtractor::InvalidatePartOfView(const basegfx::B2DRange& rRang
// forward access to SdrPageView to VOCOfPageObj
bool PagePrimitiveExtractor::isOutputToPrinter() const { return mrViewObjectContactOfPageObj.GetObjectContact().isOutputToPrinter(); }
-bool PagePrimitiveExtractor::isOutputToWindow() const { return mrViewObjectContactOfPageObj.GetObjectContact().isOutputToWindow(); }
-bool PagePrimitiveExtractor::isOutputToVirtualDevice() const { return mrViewObjectContactOfPageObj.GetObjectContact().isOutputToVirtualDevice(); }
bool PagePrimitiveExtractor::isOutputToRecordingMetaFile() const { return mrViewObjectContactOfPageObj.GetObjectContact().isOutputToRecordingMetaFile(); }
bool PagePrimitiveExtractor::isOutputToPDFFile() const { return mrViewObjectContactOfPageObj.GetObjectContact().isOutputToPDFFile(); }
bool PagePrimitiveExtractor::isDrawModeGray() const { return mrViewObjectContactOfPageObj.GetObjectContact().isDrawModeGray(); }
-bool PagePrimitiveExtractor::isDrawModeBlackWhite() const { return mrViewObjectContactOfPageObj.GetObjectContact().isDrawModeBlackWhite(); }
bool PagePrimitiveExtractor::isDrawModeHighContrast() const { return mrViewObjectContactOfPageObj.GetObjectContact().isDrawModeHighContrast(); }
SdrPageView* PagePrimitiveExtractor::TryToGetSdrPageView() const { return mrViewObjectContactOfPageObj.GetObjectContact().TryToGetSdrPageView(); }
OutputDevice* PagePrimitiveExtractor::TryToGetOutputDevice() const { return mrViewObjectContactOfPageObj.GetObjectContact().TryToGetOutputDevice(); }
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index 621521ebf9cb..c3fa222b83ed 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -261,11 +261,6 @@ namespace sdr
// default has nothing to do
}
- void OverlayManager::restoreBackground(const vcl::Region& /*rRegion*/) const
- {
- // unbuffered versions do nothing here
- }
-
void OverlayManager::add(OverlayObject& rOverlayObject)
{
OSL_ENSURE(nullptr == rOverlayObject.mpOverlayManager, "OverlayObject is added twice to an OverlayManager (!)");
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 9ee032c1ee3b..2d4514c90046 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -413,16 +413,6 @@ namespace sdr
ImpBufferTimerHandler(nullptr);
}
- void OverlayManagerBuffered::restoreBackground(const vcl::Region& rRegion) const
- {
- // restore
- const vcl::Region aRegionPixel(getOutputDevice().LogicToPixel(rRegion));
- ImpRestoreBackground(aRegionPixel);
-
- // call parent
- OverlayManager::restoreBackground(rRegion);
- }
-
void OverlayManagerBuffered::invalidateRange(const basegfx::B2DRange& rRange)
{
if(!rRange.isEmpty())
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 6b4e4c67c09f..d9a6fc66796a 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -82,23 +82,6 @@ bool SdrMarkView::HasMarkedPoints() const
return bRet;
}
-sal_Int32 SdrMarkView::GetMarkedPointCount() const
-{
- ForceUndirtyMrkPnt();
- sal_Int32 nCount=0;
- if (!ImpIsFrameHandles()) {
- size_t nMarkCount=GetMarkedObjectCount();
- if (nMarkCount<=static_cast<size_t>(mnFrameHandlesLimit)) {
- for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) {
- const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
- const SdrUShortCont& rPts = pM->GetMarkedPoints();
- nCount += rPts.size();
- }
- }
- }
- return nCount;
-}
-
bool SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const
{
return !ImpIsFrameHandles() && !rHdl.IsPlusHdl() && rHdl.GetKind()!=SdrHdlKind::Glue && rHdl.GetKind()!=SdrHdlKind::SmartTag && rHdl.GetObj()!=nullptr && rHdl.GetObj()->IsPolyObj();
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 83b35d8d4c1c..b9ba5a92dda9 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1754,17 +1754,6 @@ void SdrObject::NbcReformatText()
{
}
-void SdrObject::ReformatText()
-{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
- NbcReformatText();
- SetChanged();
- BroadcastObjectChange();
- if (GetCurrentBoundRect()!=aBoundRect0) {
- SendUserCall(SdrUserCallType::Resize,aBoundRect0);
- }
-}
-
void SdrObject::BurnInStyleSheetAttributes()
{
GetProperties().ForceStyleToHardAttributes();
@@ -1813,11 +1802,6 @@ bool SdrObject::DoMacro(const SdrObjMacroHitRec&)
return false;
}
-OUString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec&) const
-{
- return OUString();
-}
-
bool SdrObject::IsMacroHit(const SdrObjMacroHitRec& rRec) const
{
return CheckMacroHit(rRec) != nullptr;
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index fc2a42d71735..7168b6206e61 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -766,11 +766,6 @@ void SdrObjGroup::NbcReformatText()
NbcReformatAllTextObjects();
}
-void SdrObjGroup::ReformatText()
-{
- ReformatAllTextObjects();
-}
-
SdrObject* SdrObjGroup::DoConvertToPolyObj(bool bBezier, bool bAddText) const
{
SdrObject* pGroup = new SdrObjGroup(getSdrModelFromSdrObject());
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 2a520936da66..da6a4280a1eb 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1430,21 +1430,6 @@ void SdrTextObj::NbcReformatText()
}
}
-void SdrTextObj::ReformatText()
-{
- if(GetOutlinerParaObject())
- {
- tools::Rectangle aBoundRect0;
- if (pUserCall!=nullptr)
- aBoundRect0=GetLastBoundRect();
-
- NbcReformatText();
- SetChanged();
- BroadcastObjectChange();
- SendUserCall(SdrUserCallType::Resize,aBoundRect0);
- }
-}
-
SdrObjGeoData* SdrTextObj::NewGeoData() const
{
return new SdrTextObjGeoData;
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index bfdd163c2391..e0fa4bf168e2 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -520,12 +520,6 @@ void SdrVirtObj::NbcReformatText()
rRefObj.NbcReformatText();
}
-void SdrVirtObj::ReformatText()
-{
- rRefObj.ReformatText();
-}
-
-
bool SdrVirtObj::HasMacro() const
{
return rRefObj.HasMacro();
@@ -551,11 +545,6 @@ bool SdrVirtObj::DoMacro(const SdrObjMacroHitRec& rRec)
return rRefObj.DoMacro(rRec); // TODO: positioning offset
}
-OUString SdrVirtObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const
-{
- return rRefObj.GetMacroPopupComment(rRec); // TODO: positioning offset
-}
-
const Point SdrVirtObj::GetOffset() const
{
// #i73248# default offset of SdrVirtObj is aAnchor
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 7ce2e18cb546..fe440edf4649 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -450,39 +450,6 @@ SdrObject* SdrObjList::RemoveObject(size_t nObjNum)
return pObj;
}
-SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum)
-{
- if (nObjNum >= maList.size() || pNewObj == nullptr)
- {
- OSL_ASSERT(nObjNum<maList.size());
- OSL_ASSERT(pNewObj!=nullptr);
- return nullptr;
- }
-
- SdrObject* pObj=maList[nObjNum];
- DBG_ASSERT(pObj!=nullptr,"SdrObjList::ReplaceObject: Could not find object to remove.");
- if (pObj!=nullptr) {
- DBG_ASSERT(pObj->IsInserted(),"SdrObjList::ReplaceObject: the object does not have status Inserted.");
- pObj->InsertedStateChange();
- SetParentAtSdrObjectFromSdrObjList(*pObj, nullptr);
- ReplaceObjectInContainer(*pNewObj,nObjNum);
-
- // flushViewObjectContacts() clears the VOC's and those invalidate
- pObj->GetViewContact().flushViewObjectContacts();
-
- pNewObj->SetOrdNum(nObjNum);
- SetParentAtSdrObjectFromSdrObjList(*pNewObj, this);
-
- // Inform the parent about change to allow invalidations at
- // evtl. existing parent visualisations
- impChildInserted(*pNewObj);
-
- pNewObj->InsertedStateChange();
- SetSdrObjListRectsDirty();
- }
- return pObj;
-}
-
SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, size_t nObjNum)
{
if (nObjNum >= maList.size())
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index b9cd69098072..09bf65d05f68 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -1718,11 +1718,8 @@ OUString SdrUndoPageChangeMasterPage::GetComment() const
SdrUndoFactory::~SdrUndoFactory(){}
+
// shapes
-SdrUndoAction* SdrUndoFactory::CreateUndoMoveObject( SdrObject& rObject )
-{
- return new SdrUndoMoveObj( rObject );
-}
SdrUndoAction* SdrUndoFactory::CreateUndoMoveObject( SdrObject& rObject, const Size& rDist )
{
@@ -1804,11 +1801,6 @@ SdrUndoAction* SdrUndoFactory::CreateUndoDeleteLayer(sal_uInt16 nLayerNum, SdrLa
return new SdrUndoDelLayer( nLayerNum, rNewLayerAdmin, rNewModel );
}
-SdrUndoAction* SdrUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNewPos1)
-{
- return new SdrUndoMoveLayer( nLayerNum, rNewLayerAdmin, rNewModel, nNewPos1 );
-}
-
// page
SdrUndoAction* SdrUndoFactory::CreateUndoDeletePage(SdrPage& rPage)
{
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 8a9dbac463da..88c58cff636b 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -2006,18 +2006,6 @@ void SdrTableObj::NbcReformatText()
}
-void SdrTableObj::ReformatText()
-{
- tools::Rectangle aBoundRect0;
- if (pUserCall!=nullptr)
- aBoundRect0=GetLastBoundRect();
- NbcReformatText();
- SetChanged();
- BroadcastObjectChange();
- SendUserCall(SdrUserCallType::Resize,aBoundRect0);
-}
-
-
bool SdrTableObj::IsVerticalWriting() const
{
const SvxWritingModeItem* pModeItem = &GetObjectItem( SDRATTR_TEXTDIRECTION );
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index f7c26ff87270..790ce87893ab 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -139,7 +139,6 @@ public:
bool IsValid() const;
- tools::Rectangle GetVisArea();
Point LogicToPixel( const Point&, const MapMode& rMapMode );
Point PixelToLogic( const Point&, const MapMode& rMapMode );
@@ -822,35 +821,6 @@ bool SvxTextEditSourceImpl::IsValid() const
return mpView && mpWindow;
}
-tools::Rectangle SvxTextEditSourceImpl::GetVisArea()
-{
- if( IsValid() )
- {
- SdrPaintWindow* pPaintWindow = mpView->FindPaintWindow(*mpWindow);
- tools::Rectangle aVisArea;
-
- if(pPaintWindow)
- {
- aVisArea = pPaintWindow->GetVisibleArea();
- }
-
- // offset vis area by edit engine left-top position
- SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>( mpObject );
- if( pTextObj )
- {
- tools::Rectangle aAnchorRect;
- pTextObj->TakeTextAnchorRect( aAnchorRect );
- aVisArea.Move( -aAnchorRect.Left(), -aAnchorRect.Top() );
-
- MapMode aMapMode(mpWindow->GetMapMode());
- aMapMode.SetOrigin(Point());
- return mpWindow->LogicToPixel( aVisArea, aMapMode );
- }
- }
-
- return tools::Rectangle();
-}
-
Point SvxTextEditSourceImpl::LogicToPixel( const Point& rPoint, const MapMode& rMapMode )
{
// The responsibilities of ViewForwarder happen to be
@@ -999,11 +969,6 @@ bool SvxTextEditSource::IsValid() const
return mpImpl->IsValid();
}
-tools::Rectangle SvxTextEditSource::GetVisArea() const
-{
- return mpImpl->GetVisArea();
-}
-
Point SvxTextEditSource::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const
{
return mpImpl->LogicToPixel( rPoint, rMapMode );
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index e3d4e352ad1b..369a6924cb5b 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -188,7 +188,6 @@ public:
virtual OutputDevice* GetDocumentRefDev() override;
virtual void OnDocumentPrinterChanged( Printer * pNewPrinter ) override;
- virtual void PrepareReload() override;
virtual void SetModified( bool = true ) override;
/// Dispatcher
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 97ada4680c47..86d72ac8fb88 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1187,10 +1187,6 @@ void SwDocShell::SetView(SwView* pVw)
m_pWrtShell = nullptr;
}
-void SwDocShell::PrepareReload()
-{
-}
-
// #i59688#
// linked graphics are now loaded on demand.
// Thus, loading of linked graphics no longer needed and necessary for
diff --git a/sw/source/uibase/inc/drawbase.hxx b/sw/source/uibase/inc/drawbase.hxx
index b369700115ec..a59a8ea13d40 100644
--- a/sw/source/uibase/inc/drawbase.hxx
+++ b/sw/source/uibase/inc/drawbase.hxx
@@ -50,7 +50,6 @@ public:
bool IsCreateObj() const { return m_bCreateObj; }
// mouse- & key events; return value=true: event was edited
- virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
virtual bool MouseButtonUp(const MouseEvent& rMEvt);
virtual bool MouseButtonDown(const MouseEvent& rMEvt);
diff --git a/sw/source/uibase/inc/dselect.hxx b/sw/source/uibase/inc/dselect.hxx
index c3996640bc41..cac7e5ce4396 100644
--- a/sw/source/uibase/inc/dselect.hxx
+++ b/sw/source/uibase/inc/dselect.hxx
@@ -27,9 +27,6 @@ class DrawSelection : public SwDrawBase
public:
DrawSelection(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView);
- // mouse- & key events
- virtual bool KeyInput(const KeyEvent& rKEvt) override;
-
virtual void Activate(const sal_uInt16 nSlotId) override; // activate function
};
diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx
index bb5fd3b9a5e9..fdd09bab6dc9 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -460,91 +460,6 @@ void SwDrawBase::Deactivate()
// If a KeyEvent is processed then the return value is true, otherwise
// false.
-bool SwDrawBase::KeyInput(const KeyEvent& rKEvt)
-{
- bool bReturn = false;
- sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
-
- switch (nCode)
- {
- case KEY_ESCAPE:
- {
- if (m_pWin->IsDrawAction())
- {
- BreakCreate();
- m_pView->LeaveDrawCreate();
- }
-
- bReturn = true;
- }
- break;
-
- case KEY_DELETE:
- {
- m_pSh->DelSelectedObj();
- bReturn = true;
- }
- break;
-
- case KEY_UP:
- case KEY_DOWN:
- case KEY_LEFT:
- case KEY_RIGHT:
- {
- SdrView *pSdrView = m_pSh->GetDrawView();
-
- if (!pSdrView->IsTextEdit())
- {
- long nX = 0;
- long nY = 0;
-
- if (nCode == KEY_UP)
- {
- // Scroll to top
- nX = 0;
- nY =-1;
- }
- else if (nCode == KEY_DOWN)
- {
- // Scroll down
- nX = 0;
- nY = 1;
- }
- else if (nCode == KEY_LEFT)
- {
- // Scroll left
- nX =-1;
- nY = 0;
- }
- else if (nCode == KEY_RIGHT)
- {
- // Scroll right
- nX = 1;
- nY = 0;
- }
-
- if (pSdrView->AreObjectsMarked() && rKEvt.GetKeyCode().IsMod2())
- {
- // Move objects
- nX *= 100;
- nY *= 100;
- pSdrView->MoveAllMarked(Size(nX, nY));
- }
-
- bReturn = true;
- }
- }
- break;
- }
-
- return bReturn;
-}
-
-// Process keyboard events
-
-// If a KeyEvent is processed then the return value is true, otherwise
-// false.
-
void SwDrawBase::BreakCreate()
{
m_pSh->BreakCreate();
diff --git a/sw/source/uibase/ribbar/dselect.cxx b/sw/source/uibase/ribbar/dselect.cxx
index 9dd3b1a0c2bc..c0403c05889d 100644
--- a/sw/source/uibase/ribbar/dselect.cxx
+++ b/sw/source/uibase/ribbar/dselect.cxx
@@ -31,35 +31,6 @@ DrawSelection::DrawSelection(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView*
m_bCreateObj = false;
}
-// Process keyboard events
-
-// If a KeyEvent is processed then the return value is true, otherwise
-// false.
-
-bool DrawSelection::KeyInput(const KeyEvent& rKEvt)
-{
- bool bReturn = false;
-
- switch (rKEvt.GetKeyCode().GetCode())
- {
- case KEY_ESCAPE:
- {
- if (m_pWin->IsDrawAction())
- {
- m_pSh->BreakMark();
- m_pWin->ReleaseMouse();
- }
- bReturn = true;
- }
- break;
- }
-
- if (!bReturn)
- bReturn = SwDrawBase::KeyInput(rKEvt);
-
- return bReturn;
-}
-
void DrawSelection::Activate(const sal_uInt16 nSlotId)
{
m_pWin->SetSdrDrawMode(OBJ_NONE);
diff --git a/vcl/inc/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx
index dbfb14bec43e..fda53207c550 100644
--- a/vcl/inc/printerinfomanager.hxx
+++ b/vcl/inc/printerinfomanager.hxx
@@ -153,28 +153,6 @@ public:
// printer discovery to finish
virtual bool checkPrintersChanged( bool bWait );
- // members for administration
-
- // add a named printer
- // addPrinter fails if a printer with the same name already exists
- // or the driver does not exist
- virtual bool addPrinter( const OUString& rPrinterName, const OUString& rDriverName );
-
- // remove a named printer
- // this fails if the config file belonging to this printer
- // is not writeable
- // if bCheckOnly is true, the printer is not really removed;
- // this is for checking if the removal would fail
- virtual bool removePrinter( const OUString& rPrinterName, bool bCheckOnly );
-
- // save the changes to all printers. this fails if there
- // is no writable config file at all
- virtual bool writePrinterConfig();
-
- // set a new default printer
- // fails if the specified printer does not exist
- virtual bool setDefaultPrinter( const OUString& rPrinterName );
-
// abstract print command
// returns a stdio FILE* that a postscript file may be written to
// this may either be a regular file or the result of popen()
diff --git a/vcl/inc/unx/cpdmgr.hxx b/vcl/inc/unx/cpdmgr.hxx
index a9caaead9942..8e15cb0ba27b 100644
--- a/vcl/inc/unx/cpdmgr.hxx
+++ b/vcl/inc/unx/cpdmgr.hxx
@@ -116,12 +116,6 @@ public:
// check if the printer configuration has changed
virtual bool checkPrintersChanged( bool bWait ) override;
-
- // members for administration
- // disable for CPD
- virtual bool addPrinter( const OUString& rPrinterName, const OUString& rDriverName ) override;
- virtual bool removePrinter( const OUString& rPrinterName, bool bCheckOnly ) override;
- virtual bool setDefaultPrinter( const OUString& rPrinterName ) override;
};
} // namespace psp
diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx
index 46076c09fa70..2283880c0b2d 100644
--- a/vcl/inc/unx/cupsmgr.hxx
+++ b/vcl/inc/unx/cupsmgr.hxx
@@ -82,13 +82,6 @@ public:
/// check if the printer configuration has changed
virtual bool checkPrintersChanged( bool bWait ) override;
-
- // members for administration
- // disable for CUPS
- virtual bool addPrinter( const OUString& rPrinterName, const OUString& rDriverName ) override;
- virtual bool removePrinter( const OUString& rPrinterName, bool bCheckOnly ) override;
- virtual bool writePrinterConfig() override;
- virtual bool setDefaultPrinter( const OUString& rPrinterName ) override;
};
} // namespace psp
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index d287257b9436..e724730dff99 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -408,13 +408,6 @@ void FormatterBase::SetStrictFormat( bool bStrict )
}
}
-void FormatterBase::SetLocale( const lang::Locale& rLocale )
-{
- ImplGetLocaleDataWrapper().setLanguageTag( LanguageTag( rLocale) );
- mbDefaultLocale = false;
- ReformatAll();
-}
-
const lang::Locale& FormatterBase::GetLocale() const
{
if ( !mpLocaleDataWrapper || mbDefaultLocale )
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 62f1b5bb8278..912b104eb56e 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list