officecfg/registry/schema/org/openoffice/Office/Common.xcs | 7 +
sfx2/source/dialog/backingwindow.cxx | 5
sw/qa/extras/ooxmlexport/data/fdo75431.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12 ++
writerfilter/source/dmapper/DomainMapper.cxx | 22 +++
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 5
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 74 ++++++++++++-
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 8 +
writerfilter/source/dmapper/PropertyMap.hxx | 2
9 files changed, 131 insertions(+), 4 deletions(-)
New commits:
commit 2ba645fee8ea7e4c5e1ad9a81774a33e899cf18d
Author: Vinaya Mandke <vinaya.man...@synerzip.com>
Date: Fri Apr 18 15:50:51 2014 +0530
fdo#39056 fdo#75431 Section Properties if section starts with table
Section properties are not imported if the section starts with a table for
DOCX,
and also for a few RTF files with combination of tables and section breaks.
SwXBodyText::createTextCursorByRange is not able to find the start of
section and hence
section properties are not applied.
As a workaround added an empty paragraph at the beginning of every section
which has the the first element as a table. And then removed it when the
section ends ( DomainMapper::lcl_endSectionGroup is called).
Also handled to add the paragraph earlier, if there is a bookmark
so that the bookmark is not attached to the dummy paragraph.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/9097
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
writerfilter/source/dmapper/DomainMapper.cxx
Change-Id: I717ba40e22b055d974bc83d4414aeb2945e16d26
diff --git a/sw/qa/extras/ooxmlexport/data/fdo75431.docx
b/sw/qa/extras/ooxmlexport/data/fdo75431.docx
new file mode 100644
index 0000000..4922784
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo75431.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 37fb1b5..fb00ef3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2098,6 +2098,18 @@ DECLARE_OOXMLEXPORT_TEST(testTestTitlePage,
"testTitlePage.docx")
// assertXPathChildren(pXmlDoc, "/w:document/w:body/w:sectPr/w:titlePg", 0);
}
+
+DECLARE_OOXMLEXPORT_TEST(testFDO75431, "fdo75431.docx")
+{
+ xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+
+ if (!pXmlDoc)
+ return;
+
+ assertXPath(pXmlDoc, "//w:tbl", 2);
+ assertXPath(pXmlDoc, "//w:p/w:pPr/w:sectPr/w:type", "val", "nextPage");
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index c2336c0..76d61e1 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3552,7 +3552,20 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
}
break;
case NS_ooxml::LN_tblStart:
+
+ /*
+ * Hack for Importing Section Properties
+ * LO is not able to import section properties if first element in the
+ * section is a table. So in case first element is a table add a dummy
para
+ * and remove it again when lcl_endSectionGroup is called
+ */
+ if(m_pImpl->m_nTableDepth == 0 &&
m_pImpl->GetIsFirstParagraphInSection()
+ && !m_pImpl->GetIsDummyParaAddedForTableInSection() &&
!m_pImpl->GetIsTextFrameInserted())
+ {
+ m_pImpl->AddDummyParaForTableInSection();
+ }
m_pImpl->m_nTableDepth++;
+
break;
case NS_ooxml::LN_tblEnd:
m_pImpl->m_nTableDepth--;
@@ -3649,6 +3662,7 @@ void DomainMapper::data(const sal_uInt8* /*buf*/, size_t
/*len*/,
void DomainMapper::lcl_startSectionGroup()
{
m_pImpl->PushProperties(CONTEXT_SECTION);
+ m_pImpl->SetIsFirstParagraphInSection(true);
}
void DomainMapper::lcl_endSectionGroup()
@@ -3673,7 +3687,13 @@ void DomainMapper::lcl_endSectionGroup()
SectionPropertyMap* pSectionContext = dynamic_cast< SectionPropertyMap* >(
pContext.get() );
OSL_ENSURE(pSectionContext, "SectionContext unavailable!");
if(pSectionContext)
+ {
pSectionContext->CloseSectionGroup( *m_pImpl );
+ // Remove the dummy paragraph if added for
+ // handling the section properties if section starts with a table
+ if (m_pImpl->GetIsDummyParaAddedForTableInSection())
+ m_pImpl->RemoveDummyParaForTableInSection();
+ }
m_pImpl->PopProperties(CONTEXT_SECTION);
}
@@ -3932,7 +3952,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
bool bRemove = !m_pImpl->GetParaChanged() &&
m_pImpl->GetParaSectpr() && !bSingleParagraph;
m_pImpl->SetParaSectpr(false);
m_pImpl->finishParagraph(m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH));
- if (bRemove)
+ if (bRemove && !m_pImpl->GetIsDummyParaAddedForTableInSection())
m_pImpl->RemoveLastParagraph();
}
else
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index e9e9779..1162387 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -147,6 +147,11 @@ public:
m_nLayoutType = nLayoutType;
}
+ bool isInCell()
+ {
+ return TableManager::isInCell();
+ }
+
};
}}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index bee4ad2..2b87cd7 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -173,6 +173,8 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bIsParaChange( false ),
m_bParaChanged( false ),
m_bIsFirstParaInSection( true ),
+ m_bDummyParaAddedForTableInSection( false ),
+ m_bTextFrameInserted(false),
m_bIsLastParaInSection( false ),
m_bIsInComments( false ),
m_bParaSectpr( false ),
@@ -272,6 +274,36 @@ void DomainMapper_Impl::SetDocumentSettingsProperty( const
OUString& rPropName,
}
}
}
+void DomainMapper_Impl::RemoveDummyParaForTableInSection()
+{
+ SetIsDummyParaAddedForTableInSection(false);
+ PropertyMapPtr pContext = GetTopContextOfType(CONTEXT_SECTION);
+ SectionPropertyMap* pSectionContext = dynamic_cast< SectionPropertyMap* >(
pContext.get() );
+ uno::Reference< text::XTextCursor > xCursor =
GetTopTextAppend()->createTextCursorByRange(pSectionContext->GetStartingRange());
+
+ uno::Reference<container::XEnumerationAccess> xEnumerationAccess(xCursor,
uno::UNO_QUERY);
+ if (xEnumerationAccess.is() && m_aTextAppendStack.size() == 1 )
+ {
+ uno::Reference<container::XEnumeration> xEnumeration =
xEnumerationAccess->createEnumeration();
+ uno::Reference<lang::XComponent>
xParagraph(xEnumeration->nextElement(), uno::UNO_QUERY);
+ xParagraph->dispose();
+ }
+}
+void DomainMapper_Impl::AddDummyParaForTableInSection()
+{
+
+ if (!m_aTextAppendStack.empty())
+ {
+ uno::Reference< text::XTextAppend > xTextAppend =
m_aTextAppendStack.top().xTextAppend;
+ uno::Reference< text::XTextCursor > xCrsr =
xTextAppend->getText()->createTextCursor();
+ uno::Reference< text::XText > xText = xTextAppend->getText();
+ if(xCrsr.is() && xText.is())
+ {
+ xTextAppend->finishParagraph( uno::Sequence< beans::PropertyValue
>() );
+ SetIsDummyParaAddedForTableInSection(true);
+ }
+ }
+}
void DomainMapper_Impl::RemoveLastParagraph( )
{
@@ -364,6 +396,27 @@ bool DomainMapper_Impl::GetIsFirstParagraphInSection()
return m_bIsFirstParaInSection;
}
+
+void DomainMapper_Impl::SetIsDummyParaAddedForTableInSection( bool bIsAdded )
+{
+ m_bDummyParaAddedForTableInSection = bIsAdded;
+}
+
+bool DomainMapper_Impl::GetIsDummyParaAddedForTableInSection()
+{
+ return m_bDummyParaAddedForTableInSection;
+}
+
+void DomainMapper_Impl::SetIsTextFrameInserted( bool bIsInserted )
+{
+ m_bTextFrameInserted = bIsInserted;
+}
+
+bool DomainMapper_Impl::GetIsTextFrameInserted()
+{
+ return m_bTextFrameInserted;
+}
+
void DomainMapper_Impl::SetParaSectpr(bool bParaSectpr)
{
m_bParaSectpr = bParaSectpr;
@@ -1875,6 +1928,7 @@ void DomainMapper_Impl::PushShapeContext( const
uno::Reference< drawing::XShape
uno::makeAny( true ) );
if (xSInfo->supportsService("com.sun.star.text.TextFrame"))
{
+ SetIsTextFrameInserted(true);
// Extract the special "btLr text frame" mode, requested by
oox, if needed.
uno::Reference<beans::XPropertySet> xPropertySet(xShape,
uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aGrabBag;
@@ -3858,6 +3912,18 @@ void DomainMapper_Impl::PopFieldContext()
void DomainMapper_Impl::AddBookmark( const OUString& rBookmarkName, const
OUString& rId )
{
+ /*
+ * Add the dummy paragraph to handle section properties
+ * iff the first element in the section is a table. If the dummy para is
not added yet, then add it;
+ * So bookmark is not attched to the wrong paragraph.
+ */
+ if(getTableManager( ).isInCell() && m_nTableDepth == 0 &&
GetIsFirstParagraphInSection()
+ && !GetIsDummyParaAddedForTableInSection()
&&!GetIsTextFrameInserted())
+ {
+ AddDummyParaForTableInSection();
+ }
+
+ bool bIsAfterDummyPara = GetIsDummyParaAddedForTableInSection() &&
GetIsFirstParagraphInSection();
if (m_aTextAppendStack.empty())
return;
uno::Reference< text::XTextAppend > xTextAppend =
m_aTextAppendStack.top().xTextAppend;
@@ -3873,8 +3939,10 @@ void DomainMapper_Impl::AddBookmark( const OUString&
rBookmarkName, const OUStri
uno::Reference< text::XTextContent > xBookmark(
m_xTextFactory->createInstance( sBookmarkService ), uno::UNO_QUERY_THROW );
uno::Reference< text::XTextCursor > xCursor;
uno::Reference< text::XText > xText =
aBookmarkIter->second.m_xTextRange->getText();
- if( aBookmarkIter->second.m_bIsStartOfText )
+ if( aBookmarkIter->second.m_bIsStartOfText &&
!bIsAfterDummyPara)
+ {
xCursor = xText->createTextCursorByRange(
xText->getStart() );
+ }
else
{
xCursor = xText->createTextCursorByRange(
aBookmarkIter->second.m_xTextRange );
@@ -3900,7 +3968,9 @@ void DomainMapper_Impl::AddBookmark( const OUString&
rBookmarkName, const OUStri
if (xTextAppend.is())
{
uno::Reference< text::XTextCursor > xCursor =
xTextAppend->createTextCursorByRange( xTextAppend->getEnd() );
- bIsStart = !xCursor->goLeft(1, false);
+
+ if(!bIsAfterDummyPara)
+ bIsStart = !xCursor->goLeft(1, false);
xCurrent = xCursor->getStart();
}
m_aBookmarkMap.insert(BookmarkMap_t::value_type( rId,
BookmarkInsertPosition( bIsStart, rBookmarkName, xCurrent ) ));
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 6fe81d4..cc4232d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -391,6 +391,8 @@ private:
/// If the current paragraph has any runs.
bool m_bParaChanged;
bool m_bIsFirstParaInSection;
+ bool m_bDummyParaAddedForTableInSection;
+ bool m_bTextFrameInserted;
bool m_bIsLastParaInSection;
bool m_bIsInComments;
/// If the current paragraph contains section property definitions.
@@ -462,11 +464,17 @@ public:
void StartParaChange( );
void EndParaChange( );
+ void RemoveDummyParaForTableInSection();
+ void AddDummyParaForTableInSection();
void RemoveLastParagraph( );
void SetIsLastParagraphInSection( bool bIsLast );
bool GetIsLastParagraphInSection();
void SetIsFirstParagraphInSection( bool bIsFirst );
bool GetIsFirstParagraphInSection();
+ void SetIsDummyParaAddedForTableInSection( bool bIsAdded );
+ bool GetIsDummyParaAddedForTableInSection();
+ void SetIsTextFrameInserted( bool bIsInserted );
+ bool GetIsTextFrameInserted();
void SetParaSectpr(bool bParaSectpr);
bool GetParaSectpr();
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx
b/writerfilter/source/dmapper/PropertyMap.hxx
index 456a4809..166aa61 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -220,6 +220,8 @@ public:
m_xStartingRange = xRange;
}
+ ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >
GetStartingRange() const { return m_xStartingRange; }
+
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
GetPageStyle(
const ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameContainer >& xStyles,
const ::com::sun::star::uno::Reference <
::com::sun::star::lang::XMultiServiceFactory >& xTextFactory,
commit db644424d663aca64c76bcbe5040846af5930741
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Aug 25 20:50:27 2014 +0200
make background color of startcenter configurable
(cherry picked from commit 895efd4f399fd717343bbc1ba3538fa01cf0a40a)
Conflicts:
officecfg/registry/schema/org/openoffice/Office/Common.xcs
sfx2/source/dialog/backingwindow.cxx
Change-Id: Ice6a92186d641e9446b9d328518e4000c840a142
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index affd280..33c0329 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3551,6 +3551,13 @@
</info>
<value>0</value>
</prop>
+ <prop oor:name="StartCenterBackgroundColor" oor:type="xs:int"
oor:nillable="false">
+ <!--Default 6045132 = Collabora purple-->
+ <info>
+ <desc>Specifies the background color of the start center.</desc>
+ </info>
+ <value>6045132</value>
+ </prop>
</group>
</group>
<group oor:name="Java">
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index de2c5f3..6ac80fa 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -43,6 +43,8 @@
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/task/InteractionHandler.hpp>
+#include <officecfg/Office/Common.hxx>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
@@ -60,7 +62,6 @@ const char OPEN_URL[] = ".uno:Open";
const char SERVICENAME_CFGREADACCESS[] =
"com.sun.star.configuration.ConfigurationAccess";
const int nButtonsFontSize = 15;
-const Color aButtonsBackground(92, 61, 204); // Collabora purple
const Color aButtonsText(COL_WHITE);
BackingWindow::BackingWindow( Window* i_pParent ) :
@@ -241,6 +242,8 @@ void BackingWindow::initControls()
mpHelpButton->SetControlForeground(aButtonsText);
mpExtensionsButton->SetControlForeground(aButtonsText);
+ const Color
aButtonsBackground(officecfg::Office::Common::Help::StartCenter::StartCenterBackgroundColor::get());
+
mpAllButtonsBox->SetBackground(aButtonsBackground);
mpSmallButtonsBox->SetBackground(aButtonsBackground);
mpHelpBox->SetBackground(aButtonsBackground);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
