[Libreoffice-commits] core.git: sdext/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Jun 22 06:45:35 UTC 2017
sdext/source/pdfimport/pdfiadaptor.cxx | 4 ---
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 8 ------
sdext/source/pdfimport/tree/pdfiprocessor.hxx | 8 ------
sdext/source/presenter/PresenterPaneContainer.cxx | 12 +--------
sdext/source/presenter/PresenterPaneContainer.hxx | 10 --------
sdext/source/presenter/PresenterScreen.cxx | 21 ++---------------
sdext/source/presenter/PresenterScreen.hxx | 7 -----
sdext/source/presenter/PresenterSlideSorter.cxx | 5 ----
sdext/source/presenter/PresenterSlideSorter.hxx | 1
sdext/source/presenter/PresenterToolBar.cxx | 6 ----
sdext/source/presenter/PresenterToolBar.hxx | 1
sdext/source/presenter/PresenterWindowManager.cxx | 27 ----------------------
12 files changed, 9 insertions(+), 101 deletions(-)
New commits:
commit 66efe63e2a2a80e46d2ee4a340a1f4d4c1bf66c3
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Jun 21 14:02:28 2017 +0200
loplugin:unusedfields in sdext
Change-Id: Ib4ce46f370298a0ae86fa95141abb253c2bbfff8
Reviewed-on: https://gerrit.libreoffice.org/39058
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index b4fd1e83ab60..1bbbdf4660c1 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -242,10 +242,6 @@ bool PDFIRawAdaptor::parse( const uno::Reference<io::XInputStream>& xInput
std::shared_ptr<PDFIProcessor> pSink(
new PDFIProcessor(xStatus, m_xContext));
- // TEMP! TEMP!
- if( m_bEnableToplevelText )
- pSink->enableToplevelText();
-
bool bSuccess=false;
if( xInput.is() )
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 7463089277a1..29b8a56b6a0b 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -70,8 +70,7 @@ namespace pdfi
m_aImages(),
m_nPages(0),
m_nNextZOrder( 1 ),
- m_xStatusIndicator( xStat ),
- m_bHaveTextOnDocLevel(false)
+ m_xStatusIndicator( xStat )
{
FontAttributes aDefFont;
aDefFont.familyName = "Helvetica";
@@ -87,11 +86,6 @@ namespace pdfi
m_aGCToId[ aDefGC ] = 0;
}
-void PDFIProcessor::enableToplevelText()
-{
- m_bHaveTextOnDocLevel = true;
-}
-
void PDFIProcessor::setPageNum( sal_Int32 nPages )
{
m_nPages = nPages;
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index 1588b057d9c3..81facadfd9fd 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -73,9 +73,6 @@ namespace pdfi
explicit PDFIProcessor( const css::uno::Reference< css::task::XStatusIndicator >& xStat,
css::uno::Reference< css::uno::XComponentContext > const & xContext) ;
- /// TEMP - enable writer-like text:p on doc level
- void enableToplevelText();
-
void emit( XmlEmitter& rEmitter,
const TreeVisitorFactory& rVisitorFactory );
@@ -193,11 +190,8 @@ namespace pdfi
sal_Int32 m_nPages;
sal_Int32 m_nNextZOrder;
- css::uno::Reference<
- css::task::XStatusIndicator >
+ css::uno::Reference< css::task::XStatusIndicator >
m_xStatusIndicator;
-
- bool m_bHaveTextOnDocLevel;
};
class CharGlyph final
{
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index 66eef2cef50f..91a520d688ca 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -57,11 +57,7 @@ void PresenterPaneContainer::PreparePane (
const OUString& rsTitle,
const OUString& rsAccessibleTitle,
const bool bIsOpaque,
- const ViewInitializationFunction& rViewInitialization,
- const double nLeft,
- const double nTop,
- const double nRight,
- const double nBottom)
+ const ViewInitializationFunction& rViewInitialization)
{
if ( ! rxPaneId.is())
return;
@@ -86,10 +82,6 @@ void PresenterPaneContainer::PreparePane (
}
pDescriptor->msAccessibleTitleTemplate = rsAccessibleTitle;
pDescriptor->maViewInitialization = rViewInitialization;
- pDescriptor->mnLeft = nLeft;
- pDescriptor->mnTop = nTop;
- pDescriptor->mnRight = nRight;
- pDescriptor->mnBottom = nBottom;
pDescriptor->mbIsActive = true;
pDescriptor->mbIsOpaque = bIsOpaque;
pDescriptor->maSpriteProvider = PaneDescriptor::SpriteProvider();
@@ -124,7 +116,7 @@ PresenterPaneContainer::SharedPaneDescriptor
pDescriptor = FindPaneURL(sPaneURL);
if (pDescriptor.get() == nullptr)
PreparePane(xPaneId, OUString(), OUString(), OUString(),
- false, ViewInitializationFunction(), 0,0,0,0);
+ false, ViewInitializationFunction());
pDescriptor = FindPaneURL(sPaneURL);
if (pDescriptor.get() != nullptr)
{
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index 817dabd1f576..ff8c9bf8b13e 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -90,10 +90,6 @@ public:
OUString msAccessibleTitleTemplate;
OUString msTitle;
ViewInitializationFunction maViewInitialization;
- double mnLeft;
- double mnTop;
- double mnRight;
- double mnBottom;
SharedBitmapDescriptor mpViewBackground;
bool mbIsActive;
bool mbIsOpaque;
@@ -114,11 +110,7 @@ public:
const OUString& rsTitle,
const OUString& rsAccessibleTitle,
const bool bIsOpaque,
- const ViewInitializationFunction& rViewIntialization,
- const double nLeft,
- const double nTop,
- const double nRight,
- const double nBottom);
+ const ViewInitializationFunction& rViewIntialization);
SharedPaneDescriptor StorePane (
const rtl::Reference<PresenterPaneBase>& rxPane);
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index bf10764fff4a..234664ceb84f 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -259,7 +259,6 @@ PresenterScreen::PresenterScreen (
mpPresenterController(),
mxSavedConfiguration(),
mpPaneContainer(),
- mnComponentIndex(0),
mxPaneFactory(),
mxViewFactory(),
maViewDescriptors()
@@ -685,7 +684,6 @@ void PresenterScreen::ProcessLayout (
aProperties[3] = "RelativeY";
aProperties[4] = "RelativeWidth";
aProperties[5] = "RelativeHeight";
- mnComponentIndex = 1;
PresenterConfigurationAccess::ForAll(
xList,
aProperties,
@@ -713,7 +711,6 @@ void PresenterScreen::ProcessViewDescriptions (
aProperties[1] = "Title";
aProperties[2] = "AccessibleTitle";
aProperties[3] = "IsOpaque";
- mnComponentIndex = 1;
PresenterConfigurationAccess::ForAll(
xViewDescriptionsNode,
aProperties,
@@ -761,11 +758,7 @@ void PresenterScreen::ProcessComponent (
rxAnchorId,
sPaneURL,
sViewURL,
- PresenterPaneContainer::ViewInitializationFunction(),
- nX,
- nY,
- nX+nWidth,
- nY+nHeight);
+ PresenterPaneContainer::ViewInitializationFunction());
}
}
catch (const Exception&)
@@ -806,11 +799,7 @@ void PresenterScreen::SetupView(
const Reference<XResourceId>& rxAnchorId,
const OUString& rsPaneURL,
const OUString& rsViewURL,
- const PresenterPaneContainer::ViewInitializationFunction& rViewInitialization,
- const double nLeft,
- const double nTop,
- const double nRight,
- const double nBottom)
+ const PresenterPaneContainer::ViewInitializationFunction& rViewInitialization)
{
Reference<XConfigurationController> xCC (mxConfigurationControllerWeak);
if (xCC.is())
@@ -830,11 +819,7 @@ void PresenterScreen::SetupView(
aViewDescriptor.msTitle,
aViewDescriptor.msAccessibleTitle,
aViewDescriptor.mbIsOpaque,
- rViewInitialization,
- nLeft,
- nTop,
- nRight,
- nBottom);
+ rViewInitialization);
}
}
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
index fe9346231195..963582b62159 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sdext/source/presenter/PresenterScreen.hxx
@@ -132,7 +132,6 @@ private:
::rtl::Reference<PresenterController> mpPresenterController;
css::uno::Reference<css::drawing::framework::XConfiguration> mxSavedConfiguration;
::rtl::Reference<PresenterPaneContainer> mpPaneContainer;
- sal_Int32 mnComponentIndex;
css::uno::Reference<css::drawing::framework::XResourceFactory> mxPaneFactory;
css::uno::Reference<css::drawing::framework::XResourceFactory> mxViewFactory;
@@ -204,11 +203,7 @@ private:
const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId,
const OUString& rsPaneURL,
const OUString& rsViewURL,
- const PresenterPaneContainer::ViewInitializationFunction& rViewInitialization,
- const double nLeft,
- const double nTop,
- const double nRight,
- const double nBottom);
+ const PresenterPaneContainer::ViewInitializationFunction& rViewInitialization);
/** Return the built-in screen number on the presentation will normally
display the presenter console.
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index d79454ebb1f8..56405880ad17 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -247,7 +247,6 @@ PresenterSlideSorter::PresenterSlideSorter (
mpPresenterController(rpPresenterController),
mxSlideShowController(mpPresenterController->GetSlideShowController()),
mxPreviewCache(),
- mbIsPaintPending(true),
mbIsLayoutPending(true),
mpLayout(),
mpVerticalScrollBar(),
@@ -441,7 +440,6 @@ void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventOb
{
mxCanvas = nullptr;
mbIsLayoutPending = true;
- mbIsPaintPending = true;
mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
}
@@ -665,7 +663,6 @@ void PresenterSlideSorter::UpdateLayout()
return;
mbIsLayoutPending = false;
- mbIsPaintPending = true;
const awt::Rectangle aWindowBox (mxWindow->getPosSize());
awt::Rectangle aCenterBox (aWindowBox);
@@ -998,8 +995,6 @@ void PresenterSlideSorter::Paint (const awt::Rectangle& rUpdateBox)
return;
}
- mbIsPaintPending = false;
-
ClearBackground(mxCanvas, rUpdateBox);
// Give the canvas to the controls.
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx
index 05bf90a50f7c..f9da7896a2e7 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
@@ -142,7 +142,6 @@ private:
::rtl::Reference<PresenterController> mpPresenterController;
css::uno::Reference<css::presentation::XSlideShowController> mxSlideShowController;
css::uno::Reference<css::drawing::XSlidePreviewCache> mxPreviewCache;
- bool mbIsPaintPending;
bool mbIsLayoutPending;
class Layout;
std::shared_ptr<Layout> mpLayout;
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index de0a63e2d355..cb3bad6511e5 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -366,7 +366,6 @@ PresenterToolBar::PresenterToolBar (
mpPresenterController(rpPresenterController),
mbIsLayoutPending(false),
meAnchor(eAnchor),
- maBoundingBox(),
maMinimalSize()
{
}
@@ -764,11 +763,6 @@ void PresenterToolBar::Layout (
double nY ((aWindowBox.Height - aTotalSize.Height) / 2);
bIsHorizontal = true;
- maBoundingBox.X1 = nX;
- maBoundingBox.Y1 = nY;
- maBoundingBox.X2 = nX + aTotalSize.Width + nTotalHorizontalGap;
- maBoundingBox.Y2 = nY + aTotalSize.Height;
-
/* push front or back ? ... */
/// check whether RTL interface or not
if(!AllSettings::GetLayoutRTL()){
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index f54e92fa0ad3..05eabc3816fa 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -159,7 +159,6 @@ private:
::rtl::Reference<PresenterController> mpPresenterController;
bool mbIsLayoutPending;
const Anchor meAnchor;
- css::geometry::RealRectangle2D maBoundingBox;
/** The minimal size that is necessary to display all elements without
overlap and with minimal gaps between them.
*/
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 4052ec9f98a9..f9de66cf2920 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -189,14 +189,6 @@ void PresenterWindowManager::SetPanePosSizeAbsolute (
mpPaneContainer->FindPaneURL(rsPaneURL));
if (pDescriptor.get() != nullptr)
{
- awt::Rectangle aParentBox = mxParentWindow->getPosSize();
- if (aParentBox.Width > 0 && aParentBox.Height > 0)
- {
- pDescriptor->mnLeft = nX / aParentBox.Width;
- pDescriptor->mnTop = nY / aParentBox.Height;
- pDescriptor->mnRight = (nX + nWidth) / aParentBox.Width;
- pDescriptor->mnBottom = (nY + nHeight) / aParentBox.Height;
- }
if (pDescriptor->mxBorderWindow.is())
pDescriptor->mxBorderWindow->setPosSize(
::sal::static_int_cast<sal_Int32>(nX),
@@ -923,25 +915,6 @@ void PresenterWindowManager::UpdateWindowSize (const Reference<awt::XWindow>& rx
{
mxClipPolygon = nullptr;
- awt::Rectangle aParentBox = mxParentWindow->getPosSize();
- awt::Rectangle aBorderBox (pDescriptor->mxBorderWindow->getPosSize());
-
- if ( ! mbIsLayouting)
- {
- const double nWidth (aParentBox.Width);
- const double nHeight (aParentBox.Height);
- pDescriptor->mnLeft = double(aBorderBox.X) / nWidth;
- pDescriptor->mnTop = double(aBorderBox.Y) / nHeight;
- pDescriptor->mnRight = double(aBorderBox.X + aBorderBox.Width) / nWidth;
- pDescriptor->mnBottom = double(aBorderBox.Y + aBorderBox.Height) / nHeight;
- }
- else
- {
- // This update of the window size was initiated by
- // Layout(). Therefore the window size does not have to be
- // updated.
- }
-
// ToTop is called last because it may invalidate the iterator.
if ( ! mbIsLayouting)
mpPaneContainer->ToTop(pDescriptor);
More information about the Libreoffice-commits
mailing list