dbaccess/source/ui/inc/QueryViewSwitch.hxx | 5 ----
dbaccess/source/ui/inc/querycontainerwindow.hxx | 2 -
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 18 --------------
sw/source/filter/ww8/ww8graf.cxx | 3 ++
sw/source/filter/ww8/ww8par.hxx | 2 +
sw/source/filter/ww8/ww8par6.cxx | 26 +++++++++++++++++++++
unusedcode.easy | 1
7 files changed, 31 insertions(+), 26 deletions(-)
New commits:
commit b5ce50d1d07394f6b59b028373120369c83d5d66
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Apr 7 09:56:43 2015 +0100
negative after-text indents ignored by msword for apos
Change-Id: I33e178f23bc4b1372c4c329954b301ae68902154
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 456ce25..3a11d1e 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2905,7 +2905,10 @@ SwFlyFrmFmt*
SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
MoveOutsideFly(pRetFrmFmt, aSave.GetStartPos(),!bJoined);
aSave.Restore( this );
+
+ StripNegativeAfterIndent(pRetFrmFmt);
}
+
}
return pRetFrmFmt;
}
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index a7fdff5..0a34059 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1488,6 +1488,7 @@ private:
bool IsDropCap();
bool IsListOrDropcap() { return (!pAktItemSet || bDropCap); };
+ //Apo == Absolutely Positioned Object, MSWord's old-style frames
WW8FlyPara *ConstructApo(const ApoTestResults &rApo,
const WW8_TablePos *pTabPos);
bool StartApo(const ApoTestResults &rApo, const WW8_TablePos *pTabPos,
SvxULSpaceItem* pULSpaceItem = 0);
@@ -1495,6 +1496,7 @@ private:
bool TestSameApo(const ApoTestResults &rApo, const WW8_TablePos *pTabPos);
ApoTestResults TestApo(int nCellLevel, bool bTableRowEnd,
const WW8_TablePos *pTabPos);
+ void StripNegativeAfterIndent(SwFrmFmt *pFlyFmt) const;
void EndSpecial();
bool ProcessSpecial(bool &rbReSync, WW8_CP nStartCp);
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 418e130..b63e639 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2430,6 +2430,32 @@ bool SwWW8ImplReader::JoinNode(SwPaM &rPam, bool
bStealAttr)
return bRet;
}
+//In auto-width word frames negative after-indent values are ignored
+void SwWW8ImplReader::StripNegativeAfterIndent(SwFrmFmt *pFlyFmt) const
+{
+ const SwNodeIndex* pSttNd = pFlyFmt->GetCntnt().GetCntntIdx();
+ if (!pSttNd)
+ return;
+
+ SwNodeIndex aIdx(*pSttNd, 1);
+ SwNodeIndex aEnd(*pSttNd->GetNode().EndOfSectionNode());
+ while (aIdx < aEnd)
+ {
+ SwTxtNode *pNd = aIdx.GetNode().GetTxtNode();
+ if (pNd)
+ {
+ const SvxLRSpaceItem& rLR = ItemGet<SvxLRSpaceItem>(*pNd,
RES_LR_SPACE);
+ if (rLR.GetRight() < 0)
+ {
+ SvxLRSpaceItem aLR(rLR);
+ aLR.SetRight(0);
+ pNd->SetAttr(aLR);
+ }
+ }
+ ++aIdx;
+ }
+}
+
void SwWW8ImplReader::StopApo()
{
OSL_ENSURE(pWFlyPara, "no pWFlyPara to close");
commit e3a899907bbf76469f074e35bbe82998a05bb2e8
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Apr 7 09:46:14 2015 +0100
OQueryViewSwitch::resizeDocumentView etc unused
Change-Id: Idadf26a1c4ec070c1a37ddac923b64620962ed9e
diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx
b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
index a945da5..e6f936a 100644
--- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx
+++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
@@ -49,8 +49,6 @@ namespace dbaui
void paste();
// clears the whole query
void clear();
- // set the view readonly or not
- void setReadOnly(bool _bReadOnly);
// check if the statement is correct when not returning false
bool checkStatement();
// set the statement for representation
@@ -83,9 +81,6 @@ namespace dbaui
void SetPosSizePixel( Point _rPt,Size _rSize);
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > getORB() const;
- protected:
- // return the Rectangle where I can paint myself
- void resizeDocumentView(Rectangle& rRect);
private:
void impl_forceSQLView();
diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx
b/dbaccess/source/ui/inc/querycontainerwindow.hxx
index 64f828e..646c5e1 100644
--- a/dbaccess/source/ui/inc/querycontainerwindow.hxx
+++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx
@@ -77,8 +77,6 @@ namespace dbaui
void setSlotEnabled( sal_Int32 _nSlotId, bool _bEnable ) {
m_pViewSwitch->setSlotEnabled( _nSlotId, _bEnable ); }
void setNoneVisbleRow(sal_Int32 _nRows) {
m_pViewSwitch->setNoneVisbleRow( _nRows); }
- void setReadOnly( bool _bReadOnly ) {
m_pViewSwitch->setReadOnly( _bReadOnly ); }
-
bool checkStatement() {
return m_pViewSwitch->checkStatement( ); }
OUString getStatement() { return
m_pViewSwitch->getStatement( ); }
void setStatement( const OUString& _rsStatement ) {
m_pViewSwitch->setStatement( _rsStatement ); }
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index dd45011..cdc16fd 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -64,16 +64,6 @@ void OQueryViewSwitch::initialize()
m_pDesignView->initialize();
}
-void OQueryViewSwitch::resizeDocumentView(Rectangle& _rPlayground)
-{
- m_pTextView->SetPosSizePixel( _rPlayground.TopLeft(),
_rPlayground.GetSize() );
- m_pDesignView->SetPosSizePixel( _rPlayground.TopLeft(),
_rPlayground.GetSize() );
-
- // just for completeness: there is no space left, we occupied it all ...
- _rPlayground.SetPos( _rPlayground.BottomRight() );
- _rPlayground.SetSize( Size( 0, 0 ) );
-}
-
bool OQueryViewSwitch::checkStatement()
{
if(m_pTextView->IsVisible())
@@ -88,14 +78,6 @@ OUString OQueryViewSwitch::getStatement()
return m_pDesignView->getStatement();
}
-void OQueryViewSwitch::setReadOnly(bool _bReadOnly)
-{
- if(m_pTextView->IsVisible())
- m_pTextView->setReadOnly(_bReadOnly);
- else
- m_pDesignView->setReadOnly(_bReadOnly);
-}
-
void OQueryViewSwitch::clear()
{
if(m_pTextView->IsVisible())
diff --git a/unusedcode.easy b/unusedcode.easy
index 0edca1b..31e3636 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -180,7 +180,6 @@
dbaui::OConnectionLineAccess::contains(com::sun::star::awt::Point const&)
dbaui::OConnectionLineAccess::isEditable() const
dbaui::OConnectionLineAccess::isShowing()
dbaui::OJoinDesignViewAccess::isEditable() const
-dbaui::OQueryViewSwitch::resizeDocumentView(Rectangle&)
dbaui::OQueryViewSwitch::setReadOnly(bool)
dbaui::OTableRowView::SetUpdatable(bool)
dbaui::OTableWindowAccess::isEditable() const
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
