loplugin:unusedfields in sdext
Change-Id: Ib4ce46f370298a0ae86fa95141abb253c2bbfff8 Reviewed-on: https://gerrit.libreoffice.org/39058 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
@@ -242,10 +242,6 @@ bool PDFIRawAdaptor::parse( const uno::Reference<io::XInputStream>& xInput
|
|||||||
std::shared_ptr<PDFIProcessor> pSink(
|
std::shared_ptr<PDFIProcessor> pSink(
|
||||||
new PDFIProcessor(xStatus, m_xContext));
|
new PDFIProcessor(xStatus, m_xContext));
|
||||||
|
|
||||||
// TEMP! TEMP!
|
|
||||||
if( m_bEnableToplevelText )
|
|
||||||
pSink->enableToplevelText();
|
|
||||||
|
|
||||||
bool bSuccess=false;
|
bool bSuccess=false;
|
||||||
|
|
||||||
if( xInput.is() )
|
if( xInput.is() )
|
||||||
|
@@ -70,8 +70,7 @@ namespace pdfi
|
|||||||
m_aImages(),
|
m_aImages(),
|
||||||
m_nPages(0),
|
m_nPages(0),
|
||||||
m_nNextZOrder( 1 ),
|
m_nNextZOrder( 1 ),
|
||||||
m_xStatusIndicator( xStat ),
|
m_xStatusIndicator( xStat )
|
||||||
m_bHaveTextOnDocLevel(false)
|
|
||||||
{
|
{
|
||||||
FontAttributes aDefFont;
|
FontAttributes aDefFont;
|
||||||
aDefFont.familyName = "Helvetica";
|
aDefFont.familyName = "Helvetica";
|
||||||
@@ -87,11 +86,6 @@ namespace pdfi
|
|||||||
m_aGCToId[ aDefGC ] = 0;
|
m_aGCToId[ aDefGC ] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void PDFIProcessor::enableToplevelText()
|
|
||||||
{
|
|
||||||
m_bHaveTextOnDocLevel = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void PDFIProcessor::setPageNum( sal_Int32 nPages )
|
void PDFIProcessor::setPageNum( sal_Int32 nPages )
|
||||||
{
|
{
|
||||||
m_nPages = nPages;
|
m_nPages = nPages;
|
||||||
|
@@ -73,9 +73,6 @@ namespace pdfi
|
|||||||
explicit PDFIProcessor( const css::uno::Reference< css::task::XStatusIndicator >& xStat,
|
explicit PDFIProcessor( const css::uno::Reference< css::task::XStatusIndicator >& xStat,
|
||||||
css::uno::Reference< css::uno::XComponentContext > const & xContext) ;
|
css::uno::Reference< css::uno::XComponentContext > const & xContext) ;
|
||||||
|
|
||||||
/// TEMP - enable writer-like text:p on doc level
|
|
||||||
void enableToplevelText();
|
|
||||||
|
|
||||||
void emit( XmlEmitter& rEmitter,
|
void emit( XmlEmitter& rEmitter,
|
||||||
const TreeVisitorFactory& rVisitorFactory );
|
const TreeVisitorFactory& rVisitorFactory );
|
||||||
|
|
||||||
@@ -193,11 +190,8 @@ namespace pdfi
|
|||||||
|
|
||||||
sal_Int32 m_nPages;
|
sal_Int32 m_nPages;
|
||||||
sal_Int32 m_nNextZOrder;
|
sal_Int32 m_nNextZOrder;
|
||||||
css::uno::Reference<
|
css::uno::Reference< css::task::XStatusIndicator >
|
||||||
css::task::XStatusIndicator >
|
|
||||||
m_xStatusIndicator;
|
m_xStatusIndicator;
|
||||||
|
|
||||||
bool m_bHaveTextOnDocLevel;
|
|
||||||
};
|
};
|
||||||
class CharGlyph final
|
class CharGlyph final
|
||||||
{
|
{
|
||||||
|
@@ -57,11 +57,7 @@ void PresenterPaneContainer::PreparePane (
|
|||||||
const OUString& rsTitle,
|
const OUString& rsTitle,
|
||||||
const OUString& rsAccessibleTitle,
|
const OUString& rsAccessibleTitle,
|
||||||
const bool bIsOpaque,
|
const bool bIsOpaque,
|
||||||
const ViewInitializationFunction& rViewInitialization,
|
const ViewInitializationFunction& rViewInitialization)
|
||||||
const double nLeft,
|
|
||||||
const double nTop,
|
|
||||||
const double nRight,
|
|
||||||
const double nBottom)
|
|
||||||
{
|
{
|
||||||
if ( ! rxPaneId.is())
|
if ( ! rxPaneId.is())
|
||||||
return;
|
return;
|
||||||
@@ -86,10 +82,6 @@ void PresenterPaneContainer::PreparePane (
|
|||||||
}
|
}
|
||||||
pDescriptor->msAccessibleTitleTemplate = rsAccessibleTitle;
|
pDescriptor->msAccessibleTitleTemplate = rsAccessibleTitle;
|
||||||
pDescriptor->maViewInitialization = rViewInitialization;
|
pDescriptor->maViewInitialization = rViewInitialization;
|
||||||
pDescriptor->mnLeft = nLeft;
|
|
||||||
pDescriptor->mnTop = nTop;
|
|
||||||
pDescriptor->mnRight = nRight;
|
|
||||||
pDescriptor->mnBottom = nBottom;
|
|
||||||
pDescriptor->mbIsActive = true;
|
pDescriptor->mbIsActive = true;
|
||||||
pDescriptor->mbIsOpaque = bIsOpaque;
|
pDescriptor->mbIsOpaque = bIsOpaque;
|
||||||
pDescriptor->maSpriteProvider = PaneDescriptor::SpriteProvider();
|
pDescriptor->maSpriteProvider = PaneDescriptor::SpriteProvider();
|
||||||
@@ -124,7 +116,7 @@ PresenterPaneContainer::SharedPaneDescriptor
|
|||||||
pDescriptor = FindPaneURL(sPaneURL);
|
pDescriptor = FindPaneURL(sPaneURL);
|
||||||
if (pDescriptor.get() == nullptr)
|
if (pDescriptor.get() == nullptr)
|
||||||
PreparePane(xPaneId, OUString(), OUString(), OUString(),
|
PreparePane(xPaneId, OUString(), OUString(), OUString(),
|
||||||
false, ViewInitializationFunction(), 0,0,0,0);
|
false, ViewInitializationFunction());
|
||||||
pDescriptor = FindPaneURL(sPaneURL);
|
pDescriptor = FindPaneURL(sPaneURL);
|
||||||
if (pDescriptor.get() != nullptr)
|
if (pDescriptor.get() != nullptr)
|
||||||
{
|
{
|
||||||
|
@@ -90,10 +90,6 @@ public:
|
|||||||
OUString msAccessibleTitleTemplate;
|
OUString msAccessibleTitleTemplate;
|
||||||
OUString msTitle;
|
OUString msTitle;
|
||||||
ViewInitializationFunction maViewInitialization;
|
ViewInitializationFunction maViewInitialization;
|
||||||
double mnLeft;
|
|
||||||
double mnTop;
|
|
||||||
double mnRight;
|
|
||||||
double mnBottom;
|
|
||||||
SharedBitmapDescriptor mpViewBackground;
|
SharedBitmapDescriptor mpViewBackground;
|
||||||
bool mbIsActive;
|
bool mbIsActive;
|
||||||
bool mbIsOpaque;
|
bool mbIsOpaque;
|
||||||
@@ -114,11 +110,7 @@ public:
|
|||||||
const OUString& rsTitle,
|
const OUString& rsTitle,
|
||||||
const OUString& rsAccessibleTitle,
|
const OUString& rsAccessibleTitle,
|
||||||
const bool bIsOpaque,
|
const bool bIsOpaque,
|
||||||
const ViewInitializationFunction& rViewIntialization,
|
const ViewInitializationFunction& rViewIntialization);
|
||||||
const double nLeft,
|
|
||||||
const double nTop,
|
|
||||||
const double nRight,
|
|
||||||
const double nBottom);
|
|
||||||
|
|
||||||
SharedPaneDescriptor StorePane (
|
SharedPaneDescriptor StorePane (
|
||||||
const rtl::Reference<PresenterPaneBase>& rxPane);
|
const rtl::Reference<PresenterPaneBase>& rxPane);
|
||||||
|
@@ -259,7 +259,6 @@ PresenterScreen::PresenterScreen (
|
|||||||
mpPresenterController(),
|
mpPresenterController(),
|
||||||
mxSavedConfiguration(),
|
mxSavedConfiguration(),
|
||||||
mpPaneContainer(),
|
mpPaneContainer(),
|
||||||
mnComponentIndex(0),
|
|
||||||
mxPaneFactory(),
|
mxPaneFactory(),
|
||||||
mxViewFactory(),
|
mxViewFactory(),
|
||||||
maViewDescriptors()
|
maViewDescriptors()
|
||||||
@@ -685,7 +684,6 @@ void PresenterScreen::ProcessLayout (
|
|||||||
aProperties[3] = "RelativeY";
|
aProperties[3] = "RelativeY";
|
||||||
aProperties[4] = "RelativeWidth";
|
aProperties[4] = "RelativeWidth";
|
||||||
aProperties[5] = "RelativeHeight";
|
aProperties[5] = "RelativeHeight";
|
||||||
mnComponentIndex = 1;
|
|
||||||
PresenterConfigurationAccess::ForAll(
|
PresenterConfigurationAccess::ForAll(
|
||||||
xList,
|
xList,
|
||||||
aProperties,
|
aProperties,
|
||||||
@@ -713,7 +711,6 @@ void PresenterScreen::ProcessViewDescriptions (
|
|||||||
aProperties[1] = "Title";
|
aProperties[1] = "Title";
|
||||||
aProperties[2] = "AccessibleTitle";
|
aProperties[2] = "AccessibleTitle";
|
||||||
aProperties[3] = "IsOpaque";
|
aProperties[3] = "IsOpaque";
|
||||||
mnComponentIndex = 1;
|
|
||||||
PresenterConfigurationAccess::ForAll(
|
PresenterConfigurationAccess::ForAll(
|
||||||
xViewDescriptionsNode,
|
xViewDescriptionsNode,
|
||||||
aProperties,
|
aProperties,
|
||||||
@@ -761,11 +758,7 @@ void PresenterScreen::ProcessComponent (
|
|||||||
rxAnchorId,
|
rxAnchorId,
|
||||||
sPaneURL,
|
sPaneURL,
|
||||||
sViewURL,
|
sViewURL,
|
||||||
PresenterPaneContainer::ViewInitializationFunction(),
|
PresenterPaneContainer::ViewInitializationFunction());
|
||||||
nX,
|
|
||||||
nY,
|
|
||||||
nX+nWidth,
|
|
||||||
nY+nHeight);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (const Exception&)
|
catch (const Exception&)
|
||||||
@@ -806,11 +799,7 @@ void PresenterScreen::SetupView(
|
|||||||
const Reference<XResourceId>& rxAnchorId,
|
const Reference<XResourceId>& rxAnchorId,
|
||||||
const OUString& rsPaneURL,
|
const OUString& rsPaneURL,
|
||||||
const OUString& rsViewURL,
|
const OUString& rsViewURL,
|
||||||
const PresenterPaneContainer::ViewInitializationFunction& rViewInitialization,
|
const PresenterPaneContainer::ViewInitializationFunction& rViewInitialization)
|
||||||
const double nLeft,
|
|
||||||
const double nTop,
|
|
||||||
const double nRight,
|
|
||||||
const double nBottom)
|
|
||||||
{
|
{
|
||||||
Reference<XConfigurationController> xCC (mxConfigurationControllerWeak);
|
Reference<XConfigurationController> xCC (mxConfigurationControllerWeak);
|
||||||
if (xCC.is())
|
if (xCC.is())
|
||||||
@@ -830,11 +819,7 @@ void PresenterScreen::SetupView(
|
|||||||
aViewDescriptor.msTitle,
|
aViewDescriptor.msTitle,
|
||||||
aViewDescriptor.msAccessibleTitle,
|
aViewDescriptor.msAccessibleTitle,
|
||||||
aViewDescriptor.mbIsOpaque,
|
aViewDescriptor.mbIsOpaque,
|
||||||
rViewInitialization,
|
rViewInitialization);
|
||||||
nLeft,
|
|
||||||
nTop,
|
|
||||||
nRight,
|
|
||||||
nBottom);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -132,7 +132,6 @@ private:
|
|||||||
::rtl::Reference<PresenterController> mpPresenterController;
|
::rtl::Reference<PresenterController> mpPresenterController;
|
||||||
css::uno::Reference<css::drawing::framework::XConfiguration> mxSavedConfiguration;
|
css::uno::Reference<css::drawing::framework::XConfiguration> mxSavedConfiguration;
|
||||||
::rtl::Reference<PresenterPaneContainer> mpPaneContainer;
|
::rtl::Reference<PresenterPaneContainer> mpPaneContainer;
|
||||||
sal_Int32 mnComponentIndex;
|
|
||||||
css::uno::Reference<css::drawing::framework::XResourceFactory> mxPaneFactory;
|
css::uno::Reference<css::drawing::framework::XResourceFactory> mxPaneFactory;
|
||||||
css::uno::Reference<css::drawing::framework::XResourceFactory> mxViewFactory;
|
css::uno::Reference<css::drawing::framework::XResourceFactory> mxViewFactory;
|
||||||
|
|
||||||
@@ -204,11 +203,7 @@ private:
|
|||||||
const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId,
|
const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId,
|
||||||
const OUString& rsPaneURL,
|
const OUString& rsPaneURL,
|
||||||
const OUString& rsViewURL,
|
const OUString& rsViewURL,
|
||||||
const PresenterPaneContainer::ViewInitializationFunction& rViewInitialization,
|
const PresenterPaneContainer::ViewInitializationFunction& rViewInitialization);
|
||||||
const double nLeft,
|
|
||||||
const double nTop,
|
|
||||||
const double nRight,
|
|
||||||
const double nBottom);
|
|
||||||
|
|
||||||
/** Return the built-in screen number on the presentation will normally
|
/** Return the built-in screen number on the presentation will normally
|
||||||
display the presenter console.
|
display the presenter console.
|
||||||
|
@@ -247,7 +247,6 @@ PresenterSlideSorter::PresenterSlideSorter (
|
|||||||
mpPresenterController(rpPresenterController),
|
mpPresenterController(rpPresenterController),
|
||||||
mxSlideShowController(mpPresenterController->GetSlideShowController()),
|
mxSlideShowController(mpPresenterController->GetSlideShowController()),
|
||||||
mxPreviewCache(),
|
mxPreviewCache(),
|
||||||
mbIsPaintPending(true),
|
|
||||||
mbIsLayoutPending(true),
|
mbIsLayoutPending(true),
|
||||||
mpLayout(),
|
mpLayout(),
|
||||||
mpVerticalScrollBar(),
|
mpVerticalScrollBar(),
|
||||||
@@ -441,7 +440,6 @@ void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventOb
|
|||||||
{
|
{
|
||||||
mxCanvas = nullptr;
|
mxCanvas = nullptr;
|
||||||
mbIsLayoutPending = true;
|
mbIsLayoutPending = true;
|
||||||
mbIsPaintPending = true;
|
|
||||||
|
|
||||||
mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
|
mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
|
||||||
}
|
}
|
||||||
@@ -665,7 +663,6 @@ void PresenterSlideSorter::UpdateLayout()
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
mbIsLayoutPending = false;
|
mbIsLayoutPending = false;
|
||||||
mbIsPaintPending = true;
|
|
||||||
|
|
||||||
const awt::Rectangle aWindowBox (mxWindow->getPosSize());
|
const awt::Rectangle aWindowBox (mxWindow->getPosSize());
|
||||||
awt::Rectangle aCenterBox (aWindowBox);
|
awt::Rectangle aCenterBox (aWindowBox);
|
||||||
@@ -998,8 +995,6 @@ void PresenterSlideSorter::Paint (const awt::Rectangle& rUpdateBox)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
mbIsPaintPending = false;
|
|
||||||
|
|
||||||
ClearBackground(mxCanvas, rUpdateBox);
|
ClearBackground(mxCanvas, rUpdateBox);
|
||||||
|
|
||||||
// Give the canvas to the controls.
|
// Give the canvas to the controls.
|
||||||
|
@@ -142,7 +142,6 @@ private:
|
|||||||
::rtl::Reference<PresenterController> mpPresenterController;
|
::rtl::Reference<PresenterController> mpPresenterController;
|
||||||
css::uno::Reference<css::presentation::XSlideShowController> mxSlideShowController;
|
css::uno::Reference<css::presentation::XSlideShowController> mxSlideShowController;
|
||||||
css::uno::Reference<css::drawing::XSlidePreviewCache> mxPreviewCache;
|
css::uno::Reference<css::drawing::XSlidePreviewCache> mxPreviewCache;
|
||||||
bool mbIsPaintPending;
|
|
||||||
bool mbIsLayoutPending;
|
bool mbIsLayoutPending;
|
||||||
class Layout;
|
class Layout;
|
||||||
std::shared_ptr<Layout> mpLayout;
|
std::shared_ptr<Layout> mpLayout;
|
||||||
|
@@ -366,7 +366,6 @@ PresenterToolBar::PresenterToolBar (
|
|||||||
mpPresenterController(rpPresenterController),
|
mpPresenterController(rpPresenterController),
|
||||||
mbIsLayoutPending(false),
|
mbIsLayoutPending(false),
|
||||||
meAnchor(eAnchor),
|
meAnchor(eAnchor),
|
||||||
maBoundingBox(),
|
|
||||||
maMinimalSize()
|
maMinimalSize()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -764,11 +763,6 @@ void PresenterToolBar::Layout (
|
|||||||
double nY ((aWindowBox.Height - aTotalSize.Height) / 2);
|
double nY ((aWindowBox.Height - aTotalSize.Height) / 2);
|
||||||
bIsHorizontal = true;
|
bIsHorizontal = true;
|
||||||
|
|
||||||
maBoundingBox.X1 = nX;
|
|
||||||
maBoundingBox.Y1 = nY;
|
|
||||||
maBoundingBox.X2 = nX + aTotalSize.Width + nTotalHorizontalGap;
|
|
||||||
maBoundingBox.Y2 = nY + aTotalSize.Height;
|
|
||||||
|
|
||||||
/* push front or back ? ... */
|
/* push front or back ? ... */
|
||||||
/// check whether RTL interface or not
|
/// check whether RTL interface or not
|
||||||
if(!AllSettings::GetLayoutRTL()){
|
if(!AllSettings::GetLayoutRTL()){
|
||||||
|
@@ -159,7 +159,6 @@ private:
|
|||||||
::rtl::Reference<PresenterController> mpPresenterController;
|
::rtl::Reference<PresenterController> mpPresenterController;
|
||||||
bool mbIsLayoutPending;
|
bool mbIsLayoutPending;
|
||||||
const Anchor meAnchor;
|
const Anchor meAnchor;
|
||||||
css::geometry::RealRectangle2D maBoundingBox;
|
|
||||||
/** The minimal size that is necessary to display all elements without
|
/** The minimal size that is necessary to display all elements without
|
||||||
overlap and with minimal gaps between them.
|
overlap and with minimal gaps between them.
|
||||||
*/
|
*/
|
||||||
|
@@ -189,14 +189,6 @@ void PresenterWindowManager::SetPanePosSizeAbsolute (
|
|||||||
mpPaneContainer->FindPaneURL(rsPaneURL));
|
mpPaneContainer->FindPaneURL(rsPaneURL));
|
||||||
if (pDescriptor.get() != nullptr)
|
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())
|
if (pDescriptor->mxBorderWindow.is())
|
||||||
pDescriptor->mxBorderWindow->setPosSize(
|
pDescriptor->mxBorderWindow->setPosSize(
|
||||||
::sal::static_int_cast<sal_Int32>(nX),
|
::sal::static_int_cast<sal_Int32>(nX),
|
||||||
@@ -923,25 +915,6 @@ void PresenterWindowManager::UpdateWindowSize (const Reference<awt::XWindow>& rx
|
|||||||
{
|
{
|
||||||
mxClipPolygon = nullptr;
|
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.
|
// ToTop is called last because it may invalidate the iterator.
|
||||||
if ( ! mbIsLayouting)
|
if ( ! mbIsLayouting)
|
||||||
mpPaneContainer->ToTop(pDescriptor);
|
mpPaneContainer->ToTop(pDescriptor);
|
||||||
|
Reference in New Issue
Block a user