[Libreoffice-commits] core.git: 4 commits - basctl/source include/svtools include/vcl sc/inc sc/source svtools/source sw/ooxmlexport_setup.mk sw/qa sw/source unusedcode.easy vcl/source
Caolán McNamara
caolanm at redhat.com
Mon May 18 07:50:36 PDT 2015
basctl/source/basicide/baside2.hxx | 1
basctl/source/basicide/baside2b.cxx | 23 -------
include/svtools/tabbar.hxx | 1
include/svtools/treelistbox.hxx | 1
include/vcl/ctrl.hxx | 3
sc/inc/scmod.hxx | 6 -
sc/source/ui/app/scmod.cxx | 87 ---------------------------
sc/source/ui/condformat/condformatmgr.cxx | 7 --
sc/source/ui/inc/anyrefdg.hxx | 7 --
sc/source/ui/inc/condformatmgr.hxx | 1
sc/source/ui/miscdlgs/anyrefdg.cxx | 6 -
svtools/source/contnr/imivctl.hxx | 2
svtools/source/contnr/imivctl1.cxx | 10 ---
svtools/source/contnr/treelistbox.cxx | 7 --
svtools/source/control/tabbar.cxx | 17 -----
sw/ooxmlexport_setup.mk | 1
sw/qa/extras/ooxmlexport/data/ooo96040-2.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 8 ++
sw/source/filter/ww8/docxattributeoutput.cxx | 35 ++++++++--
sw/source/filter/ww8/ww8par.hxx | 1
sw/source/filter/ww8/ww8par2.cxx | 8 --
unusedcode.easy | 2
vcl/source/control/ctrl.cxx | 5 -
23 files changed, 39 insertions(+), 200 deletions(-)
New commits:
commit 7cb8d59769d7f37157929a4176a8f16f6d4610e8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 18 14:25:11 2015 +0100
don't assert on export of ooo74510-1.odt to .docx
the math object is broken in the original .odt so we can't export its contents
as it doesn't have any
Change-Id: I8226cafed65b9e16a4aca6f48a4f711a55532975
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 986f333..c7d42c0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4392,6 +4392,11 @@ void DocxAttributeOutput::WritePostponedMath(const SwOLENode* pPostponedMath)
{
uno::Reference < embed::XEmbeddedObject > xObj(const_cast<SwOLENode*>(pPostponedMath)->GetOLEObj().GetOleRef());
uno::Reference< uno::XInterface > xInterface( xObj->getComponent(), uno::UNO_QUERY );
+ if (!xInterface.is())
+ {
+ SAL_WARN("sw.ww8", "Broken math object");
+ return;
+ }
// gcc4.4 (and 4.3 and possibly older) have a problem with dynamic_cast directly to the target class,
// so help it with an intermediate cast. I'm not sure what exactly the problem is, seems to be unrelated
// to RTLD_GLOBAL, so most probably a gcc bug.
commit ecb6931da61d73a9ac17aabed8f94cf74000edfa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 18 13:33:38 2015 +0100
don't fail on export of ooo96040-2.odt to docx
If we want to close a cell of a table which encloses another table, then close
that enclosed table first.
These are pretty pathalogical old-school tables. For now assume this can only
occur when the row of the enclosed table is cleanly closed and assert if that
isn't the case.
Change-Id: I28e4d40072cb8d92be361716e82574075b15dd89
diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk
index 5a0cc3b..a3a2182 100644
--- a/sw/ooxmlexport_setup.mk
+++ b/sw/ooxmlexport_setup.mk
@@ -30,6 +30,7 @@ define sw_ooxmlexport_components
chart2/source/controller/chartcontroller \
comphelper/util/comphelp \
configmgr/source/configmgr \
+ dbaccess/util/dba \
drawinglayer/drawinglayer \
embeddedobj/util/embobj \
filter/source/config/cache/filterconfig1 \
diff --git a/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt b/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt
index e8e7e99..35a1858 100644
Binary files a/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt and b/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 4cf50c9..a7f6078 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -262,6 +262,14 @@ DECLARE_OOXMLEXPORT_TEST(testOldComplexMergeleft, "tdf90681-2.odt")
assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[2]/w:tc[1]/w:tcPr/w:vMerge", "val", "continue");
}
+DECLARE_OOXMLEXPORT_TEST(testOldComplexMergeTableInTable, "ooo96040-2.odt")
+{
+ xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+
+ if (!pXmlDoc)
+ return;
+}
+
DECLARE_OOXMLEXPORT_TEST(testTablePreferredWidth, "tablePreferredWidth.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index ad8e94d..986f333 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -736,6 +736,14 @@ void DocxAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointe
if ( bEndCell )
{
+ while (pInner->getDepth() < m_tableReference->m_nTableDepth)
+ {
+ //we expect that the higher depth row was closed, and
+ //we are just missing the table close
+ assert(lastOpenCell.back() == -1 && lastClosedCell.back() == -1);
+ EndTable();
+ }
+
SyncNodelessCells(pInner, nCell, nRow);
sal_Int32 nClosedCell = lastClosedCell.back();
commit 775fd7f613ae955d144aa77852ff7ed4eae44897
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 18 13:31:26 2015 +0100
check for TableBox without StartNode
Change-Id: I77b21c85716083029ab8873094621e0f8eceb48f
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 701ebc7..ad8e94d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3597,18 +3597,22 @@ void DocxAttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer
else if ( FRMDIR_HORI_LEFT_TOP == m_rExport.TrueFrameDirection( *pFrmFmt ) )
{
// Undo the text direction mangling done by the btLr handler in writerfilter::dmapper::DomainMapperTableManager::sprm()
- SwPaM aPam(*pTabBox->GetSttNd(), 0);
- ++aPam.GetPoint()->nNode;
- if (aPam.GetPoint()->nNode.GetNode().IsTxtNode())
+ const SwStartNode* pSttNd = pTabBox->GetSttNd();
+ if (pSttNd)
{
- const SwTxtNode& rTxtNode = static_cast<const SwTxtNode&>(aPam.GetPoint()->nNode.GetNode());
- if( const SwAttrSet* pAttrSet = rTxtNode.GetpSwAttrSet())
+ SwPaM aPam(*pSttNd, 0);
+ ++aPam.GetPoint()->nNode;
+ if (aPam.GetPoint()->nNode.GetNode().IsTxtNode())
{
- const SvxCharRotateItem& rCharRotate = pAttrSet->GetCharRotate();
- if (rCharRotate.GetValue() == 900)
+ const SwTxtNode& rTxtNode = static_cast<const SwTxtNode&>(aPam.GetPoint()->nNode.GetNode());
+ if( const SwAttrSet* pAttrSet = rTxtNode.GetpSwAttrSet())
{
- m_pSerializer->singleElementNS( XML_w, XML_textDirection, FSNS( XML_w, XML_val ), "btLr", FSEND );
- m_bBtLr = true;
+ const SvxCharRotateItem& rCharRotate = pAttrSet->GetCharRotate();
+ if (rCharRotate.GetValue() == 900)
+ {
+ m_pSerializer->singleElementNS( XML_w, XML_textDirection, FSNS( XML_w, XML_val ), "btLr", FSEND );
+ m_bBtLr = true;
+ }
}
}
}
commit 0c0228c4887ac3534cfb6679886f459850a65777
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 18 11:15:10 2015 +0100
callcatcher: update unused code
Change-Id: I43dd399368953c629916dad8104a296f837a6344
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 401553a..1fc931f 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -179,7 +179,6 @@ private:
protected:
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
BreakPoint* FindBreakPoint( const Point& rMousePos );
- void ShowMarker(vcl::RenderContext& rRenderContext);
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 95b6a95..33aa565 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1426,29 +1426,6 @@ void BreakPointWindow::SetNoMarker ()
SetMarkerPos(NoMarker);
}
-void BreakPointWindow::ShowMarker(vcl::RenderContext& rRenderContext)
-{
- if (nMarkerPos == NoMarker)
- return;
-
- Size const aOutSz = GetOutputSize();
- long const nLineHeight = GetTextHeight();
-
- Image aMarker = GetImage(bErrorMarker ? IMGID_ERRORMARKER : IMGID_STEPMARKER);
-
- Size aMarkerSz(aMarker.GetSizePixel());
- aMarkerSz = rRenderContext.PixelToLogic(aMarkerSz);
- Point aMarkerOff(0, 0);
- aMarkerOff.X() = (aOutSz.Width() - aMarkerSz.Width()) / 2;
- aMarkerOff.Y() = (nLineHeight - aMarkerSz.Height()) / 2;
-
- sal_uLong nY = nMarkerPos * nLineHeight - nCurYOffset;
- Point aPos(0, nY);
- aPos += aMarkerOff;
-
- rRenderContext.DrawImage(aPos, aMarker);
-}
-
BreakPoint* BreakPointWindow::FindBreakPoint( const Point& rMousePos )
{
size_t nLineHeight = GetTextHeight();
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 2e07130..bd90be6 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -372,7 +372,6 @@ private:
SVT_DLLPRIVATE bool ImplDeactivatePage();
SVT_DLLPRIVATE void ImplPrePaint(vcl::RenderContext& rRenderContext);
SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( sal_uInt16 nItemCount );
- SVT_DLLPRIVATE Rectangle ImplGetInsertTabRect(ImplTabBarItem* pItem) const;
DECL_DLLPRIVATE_LINK(ImplClickHdl, ImplTabButton*);
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 24446dcc..b96ecd2 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -757,7 +757,6 @@ public:
SvTreeListEntry* GetEntry( const Point& rPos, bool bHit = false ) const;
- void PaintEntry(SvTreeListEntry* pEntry, vcl::RenderContext& rRenderContext);
long PaintEntry(SvTreeListEntry* pEntry, long nLine, vcl::RenderContext& rRenderContext,
SvLBoxTabFlags nTabFlagMask = SvLBoxTabFlags::ALL);
virtual Rectangle GetFocusRect( SvTreeListEntry*, long nLine );
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index e526e31..ee5b884 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -60,9 +60,6 @@ protected:
void CreateLayoutData() const;
/// determines whether we currently have layout data
bool HasLayoutData() const;
- /// returns the current layout data
- vcl::ControlLayoutData*
- GetLayoutData() const;
/** this calls both our event listeners, and a specified handler
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index d51d100..936fb43 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -73,7 +73,6 @@ class ScFormEditData;
class ScMarkData;
struct ScDragData;
struct ScClipData;
-class ScAnyRefModalDlg;
// for internal Drag&Drop:
@@ -113,7 +112,6 @@ class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener
bool mbIsInSharedDocSaving:1;
std::map<sal_uInt16, std::list<VclPtr<vcl::Window> > > m_mapRefWindow;
- std::stack<VclPtr<ScAnyRefModalDlg> > maAnyRefDlgStack;
public:
SFX_DECL_INTERFACE(SCID_APP)
@@ -257,10 +255,6 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO
SC_DLLPUBLIC bool RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd );
SC_DLLPUBLIC bool UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd );
SC_DLLPUBLIC vcl::Window * Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAncestor );
-
- ScAnyRefModalDlg* GetCurrentAnyRefDlg();
- void PushNewAnyRefDlg( ScAnyRefModalDlg* pDlg );
- void PopAnyRefDlg();
};
#define SC_MOD() ( *reinterpret_cast<ScModule**>(GetAppData(SHL_CALC)) )
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 48a3ad1..f2b7b1b 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1604,7 +1604,6 @@ bool ScModule::IsModalMode(SfxObjectShell* pDocSh)
if ( nCurRefDlgId )
{
SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId );
- ScAnyRefModalDlg* pModalDlg = GetCurrentAnyRefDlg();
if ( pChildWnd )
{
IAnyRefDialog* pRefDlg = dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow());
@@ -1612,10 +1611,6 @@ bool ScModule::IsModalMode(SfxObjectShell* pDocSh)
bIsModal = pChildWnd->IsVisible() && pRefDlg &&
!( pRefDlg->IsRefInputMode() && pRefDlg->IsDocAllowed(pDocSh) );
}
- else if(pModalDlg)
- {
- bIsModal = pModalDlg->IsVisible() && !(pModalDlg->IsRefInputMode() && pModalDlg->IsDocAllowed(pDocSh) );
- }
else
{
// in 592 and above, the dialog isn't visible in other views
@@ -1646,7 +1641,6 @@ bool ScModule::IsTableLocked()
if ( nCurRefDlgId )
{
SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId );
- ScAnyRefModalDlg* pModalDlg = GetCurrentAnyRefDlg();
if ( pChildWnd )
{
IAnyRefDialog* pRefDlg(dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow()));
@@ -1656,8 +1650,6 @@ bool ScModule::IsTableLocked()
bLocked = pRefDlg->IsTableLocked();
}
}
- else if( pModalDlg )
- bLocked = pModalDlg->IsTableLocked();
else
bLocked = true; // for other views, see IsModalMode
}
@@ -1674,11 +1666,8 @@ bool ScModule::IsRefDialogOpen()
if ( nCurRefDlgId )
{
SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId );
- ScAnyRefModalDlg* pModalDlg = GetCurrentAnyRefDlg();
if ( pChildWnd )
bIsOpen = pChildWnd->IsVisible();
- else if(pModalDlg)
- bIsOpen = pModalDlg->IsVisible();
else
bIsOpen = true; // for other views, see IsModalMode
}
@@ -1695,17 +1684,12 @@ bool ScModule::IsFormulaMode()
if ( nCurRefDlgId )
{
SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId );
- ScAnyRefModalDlg* pModalDlg = GetCurrentAnyRefDlg();
if ( pChildWnd )
{
IAnyRefDialog* pRefDlg = dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow());
assert(pRefDlg);
bIsFormula = pChildWnd->IsVisible() && pRefDlg && pRefDlg->IsRefInputMode();
}
- else if(pModalDlg)
- {
- bIsFormula = pModalDlg->IsVisible() && pModalDlg->IsRefInputMode();
- }
else
bIsFormula = true;
}
@@ -1744,8 +1728,7 @@ void ScModule::SetReference( const ScRange& rRef, ScDocument* pDoc,
if( nCurRefDlgId )
{
SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId );
- ScAnyRefModalDlg* pModalDlg = GetCurrentAnyRefDlg();
- OSL_ENSURE( pChildWnd || pModalDlg, "NoChildWin" );
+ OSL_ENSURE( pChildWnd, "NoChildWin" );
if ( pChildWnd )
{
if ( nCurRefDlgId == SID_OPENDLG_CONSOLIDATE && pMarkData )
@@ -1767,13 +1750,6 @@ void ScModule::SetReference( const ScRange& rRef, ScDocument* pDoc,
pRefDlg->SetReference( aNew, pDoc );
}
}
- else if(pModalDlg)
- {
- // hide the (color) selection now instead of later from LoseFocus,
- // don't abort the ref input that causes this call (bDoneRefMode = sal_False)
- pModalDlg->HideReference( false );
- pModalDlg->SetReference( aNew, pDoc );
- }
}
else
{
@@ -1797,8 +1773,7 @@ void ScModule::AddRefEntry()
if ( nCurRefDlgId )
{
SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId );
- ScAnyRefModalDlg* pModalDlg = GetCurrentAnyRefDlg();
- OSL_ENSURE( pChildWnd || pModalDlg, "NoChildWin" );
+ OSL_ENSURE( pChildWnd, "NoChildWin" );
if ( pChildWnd )
{
IAnyRefDialog* pRefDlg = dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow());
@@ -1808,8 +1783,6 @@ void ScModule::AddRefEntry()
pRefDlg->AddRefEntry();
}
}
- else if(pModalDlg)
- pModalDlg->AddRefEntry();
}
else
{
@@ -1830,8 +1803,7 @@ void ScModule::EndReference()
if ( nCurRefDlgId )
{
SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId );
- ScAnyRefModalDlg* pModalDlg = GetCurrentAnyRefDlg();
- OSL_ENSURE( pChildWnd || pModalDlg, "NoChildWin" );
+ OSL_ENSURE( pChildWnd, "NoChildWin" );
if ( pChildWnd )
{
IAnyRefDialog* pRefDlg = dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow());
@@ -1841,8 +1813,6 @@ void ScModule::EndReference()
pRefDlg->SetActive();
}
}
- else if (pModalDlg)
- pModalDlg->SetActive();
}
}
@@ -2270,57 +2240,6 @@ vcl::Window * ScModule::Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAn
return NULL;
}
-ScAnyRefModalDlg* ScModule::GetCurrentAnyRefDlg()
-{
- if(!maAnyRefDlgStack.empty())
- return maAnyRefDlgStack.top();
-
- return NULL;
-}
-
-void ScModule::PushNewAnyRefDlg( ScAnyRefModalDlg* pNewDlg )
-{
- maAnyRefDlgStack.push( pNewDlg );
-
- // prevent mismatch between calls to
- // SetInRefMode(true) and SetInRefMode(false)
- if(maAnyRefDlgStack.size() != 1)
- return;
-
- SfxViewShell* pViewShell = SfxViewShell::GetFirst();
- while(pViewShell)
- {
- if ( pViewShell->ISA(ScTabViewShell) )
- {
- ScTabViewShell* pViewSh = static_cast<ScTabViewShell*>(pViewShell);
- pViewSh->SetInRefMode( true );
- }
- pViewShell = SfxViewShell::GetNext( *pViewShell );
- }
-}
-
-void ScModule::PopAnyRefDlg()
-{
- maAnyRefDlgStack.pop();
-
- if(maAnyRefDlgStack.empty())
- {
- // no modal ref dlg any more
- // disable the flag in ScGridWindow
- SfxViewShell* pViewShell = SfxViewShell::GetFirst();
- while(pViewShell)
- {
- if ( pViewShell->ISA(ScTabViewShell) )
- {
- ScTabViewShell* pViewSh = static_cast<ScTabViewShell*>(pViewShell);
- pViewSh->SetInRefMode( false );
- }
- pViewShell = SfxViewShell::GetNext( *pViewShell );
- }
-
- }
-}
-
using namespace com::sun::star;
#define LINGUPROP_AUTOSPELL "IsSpellAuto"
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index b7f3dce..05ad63a 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -92,13 +92,6 @@ ScConditionalFormat* ScCondFormatManagerWindow::GetSelection()
return mpFormatList->GetFormat(nIndex);
}
-void ScCondFormatManagerWindow::Update()
-{
- Clear();
- maMapLBoxEntryToCondIndex.clear();
- Init();
-}
-
void ScCondFormatManagerWindow::setColSizes()
{
HeaderBar &rBar = GetTheHeaderBar();
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index eef11c9..5bcc688 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -261,13 +261,6 @@ void ScRefHdlrImplBase<TWindow, bBindRef>::StateChanged( StateChangedType nState
ScRefHandler::stateChanged( nStateChange, bBindRef );
}
-class ScAnyRefModalDlg : public ScRefHdlModalImpl
-{
-public:
- ScAnyRefModalDlg(vcl::Window* pParent, const OUString& rID,
- const OUString& rUIXMLDescription);
-};
-
template<class TDerived, class TBase, bool bBindRef = true>
struct ScRefHdlrImpl: ScRefHdlrImplBase< TBase, bBindRef >
{
diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx
index 76e26fd..d713383 100644
--- a/sc/source/ui/inc/condformatmgr.hxx
+++ b/sc/source/ui/inc/condformatmgr.hxx
@@ -41,7 +41,6 @@ public:
void DeleteSelection();
ScConditionalFormat* GetSelection();
- void Update();
virtual void Resize() SAL_OVERRIDE;
};
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 116e0e3..99d4f58 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -1016,10 +1016,4 @@ void ScRefHdlModalImpl::StateChanged( StateChangedType nStateChange )
ScRefHandler::stateChanged( nStateChange, true );
}
-ScAnyRefModalDlg::ScAnyRefModalDlg(vcl::Window* pParent, const OUString& rID,
- const OUString& rUIXMLDescription)
- : ScRefHdlModalImpl(pParent, rID, rUIXMLDescription)
-{
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 9673800..9da5b13 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -364,7 +364,6 @@ public:
void LoseFocus();
void SetUpdateMode( bool bUpdate );
bool GetUpdateMode() const { return bUpdateMode; }
- void PaintEntry(SvxIconChoiceCtrlEntry* pEntry, bool bIsBackgroundPainted = false);
void PaintEntry(SvxIconChoiceCtrlEntry*, const Point&, vcl::RenderContext& rRenderContext, bool bIsBackgroundPainted = false);
void SetEntryPos(
@@ -389,7 +388,6 @@ public:
SvxIconChoiceCtrlEntry* GetEntry( const Point& rDocPos, bool bHit = false );
- static Point GetEntryPos( SvxIconChoiceCtrlEntry* );
void MakeEntryVisible( SvxIconChoiceCtrlEntry* pEntry, bool bBound = true );
void Arrange(
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 64dbe4d3..1d95123 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -1518,11 +1518,6 @@ void SvxIconChoiceCtrl_Impl::SetUpdateMode( bool bUpdate )
}
}
-void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, bool /*bIsBackgroundPainted*/)
-{
- pView->Invalidate(CalcFocusRect(pEntry));
-}
-
// priorities of the emphasis: bDropTarget => bCursored => bSelected
void SvxIconChoiceCtrl_Impl::PaintEmphasis(const Rectangle& rTextRect, const Rectangle& rImageRect, bool bSelected,
bool bDropTarget, bool bCursored, vcl::RenderContext& rRenderContext, bool bIsBackgroundPainted)
@@ -1822,11 +1817,6 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetEntry( const Point& rDocPos,
return 0;
}
-Point SvxIconChoiceCtrl_Impl::GetEntryPos( SvxIconChoiceCtrlEntry* pEntry )
-{
- return pEntry->aRect.TopLeft();
-}
-
void SvxIconChoiceCtrl_Impl::MakeEntryVisible( SvxIconChoiceCtrlEntry* pEntry, bool bBound )
{
if ( bBound )
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 3b27f3d..bdf372c 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -2855,13 +2855,6 @@ void SvTreeListBox::ImplInitStyle()
Invalidate();
}
-void SvTreeListBox::PaintEntry(SvTreeListEntry* pEntry, vcl::RenderContext& rRenderContext)
-{
- DBG_ASSERT(pEntry,"PaintEntry:No Entry");
- if (pEntry)
- pImp->PaintEntry(pEntry, rRenderContext);
-}
-
void SvTreeListBox::InvalidateEntry(SvTreeListEntry* pEntry)
{
DBG_ASSERT(pEntry,"InvalidateEntry:No Entry");
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 291786f..b293071 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1657,23 +1657,6 @@ ImplTabBarItem* TabBar::ImplGetLastTabBarItem( sal_uInt16 nItemCount )
return pItem;
}
-Rectangle TabBar::ImplGetInsertTabRect(ImplTabBarItem* pItem) const
-{
- if (mbHasInsertTab && pItem)
- {
- sal_Int32 aScaleFactor = GetDPIScaleFactor();
- sal_Int32 nInsertTabWidth = aScaleFactor * INSERT_TAB_WIDTH;
- Rectangle aInsTabRect = pItem->maRect;
- if (!mbMirrored)
- aInsTabRect.setX(aInsTabRect.getX() + aInsTabRect.getWidth());
- else
- aInsTabRect.setX(aInsTabRect.getX() - nInsertTabWidth);
- aInsTabRect.setWidth(nInsertTabWidth);
- return aInsTabRect;
- }
- return Rectangle();
-}
-
bool TabBar::DeactivatePage()
{
return true;
diff --git a/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt b/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt
new file mode 100644
index 0000000..e8e7e99
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt differ
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 7d0a938..d50b5a0 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1548,7 +1548,6 @@ private:
bool InAnyApo() const { return InEqualOrHigherApo(1); }
void TabCellEnd();
void StopTable();
- short GetTableLeft();
bool IsInvalidOrToBeMergedTabCell() const;
// Nummerierungen / Aufzaehlungen ( Autonumbered List Data Descriptor )
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 216721a..b70c789 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3488,14 +3488,6 @@ void SwWW8ImplReader::StopTable()
}
}
-// GetTableLeft() is needed for graphic objects bound to paragraphs in tables.
-// For indented tables the base for WW is the margin that would be used without
-// the table; SW uses the left table margin.
-short SwWW8ImplReader::GetTableLeft()
-{
- return (m_pTableDesc) ? m_pTableDesc->GetMinLeft() : 0;
-}
-
bool SwWW8ImplReader::IsInvalidOrToBeMergedTabCell() const
{
if( !m_pTableDesc )
diff --git a/unusedcode.easy b/unusedcode.easy
index 40e3fb1..b3008e6 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -86,7 +86,6 @@ dbaccess::StorageInputStream::close()
dbaui::OTableRowView::SetUpdatable(bool)
oglcanvas::CanvasHelper::drawPoint(com::sun::star::rendering::XCanvas const*, com::sun::star::geometry::RealPoint2D const&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&)
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const
-oox::AttributeConversion::decodeUnsignedHex(rtl::OUString const&)
oox::drawingml::TextListStyle::dump() const
sc::CLBuildKernelThread::CLBuildKernelThread()
sc::CLBuildKernelThread::consume()
@@ -99,6 +98,7 @@ sc::FormulaGroupAreaListener::getRange() const
sc::FormulaGroupAreaListener::getTopCellPos() const
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
+std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_M_move_data(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&, std::integral_constant<bool, true>)
std::__cxx1998::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long)
vcl::IsWindowSystemAvailable()
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 04c9455..a0aa05a 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -116,11 +116,6 @@ bool Control::HasLayoutData() const
return mpControlData && mpControlData->mpLayoutData != NULL;
}
-vcl::ControlLayoutData* Control::GetLayoutData() const
-{
- return mpControlData->mpLayoutData;
-}
-
void Control::SetText( const OUString& rStr )
{
ImplClearLayoutData();
More information about the Libreoffice-commits
mailing list