[Libreoffice-commits] core.git: oox/source sw/qa sw/source writerfilter/source
oox/source/drawingml/fillproperties.cxx | 30 ++
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx |2 -
sw/source/filter/ww8/docxattributeoutput.cxx |2 -
writerfilter/source/dmapper/GraphicImport.cxx |5 +---
4 files changed, 21 insertions(+), 18 deletions(-)
New commits:
commit d151ed35ad4c4e7aa9fbb807930fcf91dea2eba7
Author: Joren De Cuyper jore...@libreoffice.org
Date: Tue Jun 2 22:26:29 2015 +0200
tdf#87539 map MSO washout filter to LO's watermark colormode
Change-Id: Id28e301a74a729245b20ba6cd2adecf203633f0e
Reviewed-on: https://gerrit.libreoffice.org/16048
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Thorsten Behrens thorsten.behr...@cib.de
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index 1302a07..6879896 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -696,17 +696,29 @@ void GraphicProperties::pushToPropMap( PropertyMap
rPropMap, const GraphicHelpe
{
sal_Int16 nBrightness = getLimitedValue sal_Int16, sal_Int32 (
maBlipProps.moBrightness.get( 0 ) / PER_PERCENT, -100, 100 );
sal_Int16 nContrast = getLimitedValue sal_Int16, sal_Int32 (
maBlipProps.moContrast.get( 0 ) / PER_PERCENT, -100, 100 );
+ColorMode eColorMode = ColorMode_STANDARD;
+
+switch( maBlipProps.moColorEffect.get( XML_TOKEN_INVALID ) )
+{
+case XML_biLevel: eColorMode = ColorMode_MONO;break;
+case XML_grayscl: eColorMode = ColorMode_GREYS; break;
+}
+
if( maBlipProps.mxGraphic.is() )
{
// created transformed graphic
Reference XGraphic xGraphic = lclCheckAndApplyDuotoneTransform(
maBlipProps, maBlipProps.mxGraphic, rGraphicHelper, nPhClr );
xGraphic = lclCheckAndApplyChangeColorTransform( maBlipProps,
xGraphic, rGraphicHelper, nPhClr );
-// MSO uses a different algorithm for contrast+brightness, LO applies
contrast before brightness,
-// while MSO apparently applies half of brightness before contrast and
half after. So if only
-// contrast or brightness need to be altered, the result is the same,
but if both are involved,
-// there's no way to map that, so just force a conversion of the image.
-if( nBrightness != 0 nContrast != 0 )
+
+if (eColorMode == ColorMode_STANDARD nBrightness == 70 nContrast
== -70)
+// map MSO 'washout' to our Watermark colormode
+eColorMode = ColorMode_WATERMARK;
+else if( nBrightness != 0 nContrast != 0 )
{
+// MSO uses a different algorithm for contrast+brightness, LO
applies contrast before brightness,
+// while MSO apparently applies half of brightness before contrast
and half after. So if only
+// contrast or brightness need to be altered, the result is the
same, but if both are involved,
+// there's no way to map that, so just force a conversion of the
image.
xGraphic = applyBrightnessContrast( xGraphic, nBrightness,
nContrast );
nBrightness = 0;
nContrast = 0;
@@ -738,14 +750,6 @@ void GraphicProperties::pushToPropMap( PropertyMap
rPropMap, const GraphicHelpe
}
}
}
-
-// color effect
-ColorMode eColorMode = ColorMode_STANDARD;
-switch( maBlipProps.moColorEffect.get( XML_TOKEN_INVALID ) )
-{
-case XML_biLevel: eColorMode = ColorMode_MONO;break;
-case XML_grayscl: eColorMode = ColorMode_GREYS; break;
-}
rPropMap.setProperty(PROP_GraphicColorMode, eColorMode);
// brightness and contrast
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 47b47b8..727d448 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -973,7 +973,7 @@ DECLARE_OOXMLEXPORT_TEST(testPictureColormodeWatermark,
picture_colormode_water
if (!pXmlDoc)
return;
-assertXPath(pXmlDoc,
/w:document/w:body/w:p/w:r/w:drawing/wp:anchor/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/a:lum,
bright, 5);
+assertXPath(pXmlDoc,
/w:document/w:body/w:p/w:r/w:drawing/wp:anchor/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/a:lum,
bright, 7);
assertXPath(pXmlDoc,
/w:document/w:body/w:p/w:r/w:drawing/wp:anchor/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/a:lum,
contrast, -7);
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index ddad776..710c862 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4246,7 +4246,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
else if (nMode == GRAPHICDRAWMODE_MONO) //black/white has a 0,5
threshold in LibreOffice
m_pSerializer
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/comment_initials.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx |9 +
sw/source/uibase/fldui/fldmgr.cxx |4 +++-
3 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit fcc7ba441ec8e5116bbcc08c88b5ddb7c892c988
Author: Joren De Cuyper jore...@libreoffice.org
Date: Fri May 15 20:11:52 2015 +0200
tdf#85911 docx: export comment initials
Change-Id: I1437c197312911a15a50715235d840b24117bfba
Reviewed-on: https://gerrit.libreoffice.org/15742
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Joren De Cuyper jore...@libreoffice.org
diff --git a/sw/qa/extras/ooxmlexport/data/comment_initials.odt
b/sw/qa/extras/ooxmlexport/data/comment_initials.odt
new file mode 100644
index 000..9b84ed8
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/comment_initials.odt
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 03acd85..6dec1e1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -851,6 +851,15 @@
DECLARE_OOXMLEXPORT_TEST(testDashedLine_CustDashPercentage, dashed_line_custdas
assertXPath(pXmlDoc,/w:document/w:body/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:spPr[1]/a:ln[1]/a:custDash[1]/a:ds[3],
sp, 30);
}
+DECLARE_OOXMLEXPORT_TEST(testCommentInitials, comment_initials.odt)
+{
+xmlDocPtr pXmlDoc = parseExport(word/comments.xml);
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc,/w:comments/w:comment[1], initials, initials);
+}
+
DECLARE_OOXMLEXPORT_TEST(testTextboxRoundedCorners,
textbox-rounded-corners.docx)
{
uno::Referencedrawing::XShape xShape = getShape(1);
diff --git a/sw/source/uibase/fldui/fldmgr.cxx
b/sw/source/uibase/fldui/fldmgr.cxx
index 5a1d5e4..80308ff 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -78,6 +78,7 @@
#include tox.hxx
#include misc.hrc
#include cnttab.hxx
+#include unotools/useroptions.hxx
using namespace com::sun::star::uno;
using namespace com::sun::star::container;
@@ -773,13 +774,14 @@ bool SwFldMgr::InsertFld(
{ // ATTENTION this field is inserted by a separate dialog
case TYP_POSTITFLD:
{
+SvtUserOptions aUserOpt;
SwPostItFieldType* pType =
static_castSwPostItFieldType*(pCurShell-GetFldType(0, RES_POSTITFLD));
SwPostItField* pPostItField =
new SwPostItField(
pType,
rData.m_sPar1, // author
rData.m_sPar2, // content
-OUString(), // author's initials
+aUserOpt.GetID(), // author's initials
OUString(), // name
DateTime(DateTime::SYSTEM) );
pFld = pPostItField;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/picture_colormode_black_white.odt |binary
sw/qa/extras/ooxmlexport/data/picture_colormode_grayscale.docx |binary
sw/qa/extras/ooxmlexport/data/picture_colormode_watermark.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 30
++
sw/source/filter/ww8/docxattributeoutput.cxx| 19 +-
5 files changed, 47 insertions(+), 2 deletions(-)
New commits:
commit 0db96caf0fcce09b87621c11b584a6d81cc7df86
Author: Joren De Cuyper jore...@libreoffice.org
Date: Thu May 14 12:56:10 2015 +0200
tdf#76941 and tdf#87539: docx export image greyscale, watermark, blackwhite
Thanks to Miklos :)
Change-Id: Ib6344ff654e39bf712d7071545573fb2ec525b63
Reviewed-on: https://gerrit.libreoffice.org/15733
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Joren De Cuyper jore...@libreoffice.org
diff --git a/sw/qa/extras/ooxmlexport/data/picture_colormode_black_white.odt
b/sw/qa/extras/ooxmlexport/data/picture_colormode_black_white.odt
new file mode 100644
index 000..b2166bd
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/picture_colormode_black_white.odt differ
diff --git a/sw/qa/extras/ooxmlexport/data/picture_colormode_grayscale.docx
b/sw/qa/extras/ooxmlexport/data/picture_colormode_grayscale.docx
new file mode 100644
index 000..2bc6458
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/picture_colormode_grayscale.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/picture_colormode_watermark.odt
b/sw/qa/extras/ooxmlexport/data/picture_colormode_watermark.odt
new file mode 100644
index 000..70dd5e9
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/picture_colormode_watermark.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 6dec1e1..03afe28 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -948,6 +948,36 @@ DECLARE_OOXMLEXPORT_TEST(testPictureWrapPolygon,
picture-wrap-polygon.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int32(11), aSeq.getLength());
}
+DECLARE_OOXMLEXPORT_TEST(testPictureColormodeGrayscale,
picture_colormode_grayscale.docx)
+{
+// THe problem was that the grayscale was not exported
+xmlDocPtr pXmlDoc = parseExport (word/document.xml);
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc,
/w:document/w:body/w:p/w:r/w:drawing/wp:inline/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/a:grayscl,
1);
+}
+
+DECLARE_OOXMLEXPORT_TEST(testPictureColormodeBlackWhite,
picture_colormode_black_white.odt)
+{
+xmlDocPtr pXmlDoc = parseExport (word/document.xml);
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc,
/w:document/w:body/w:p/w:r/w:drawing/wp:anchor/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/a:biLevel,
thresh, 5);
+}
+
+DECLARE_OOXMLEXPORT_TEST(testPictureColormodeWatermark,
picture_colormode_watermark.odt)
+{
+xmlDocPtr pXmlDoc = parseExport (word/document.xml);
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc,
/w:document/w:body/w:p/w:r/w:drawing/wp:anchor/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/a:lum,
bright, 5);
+assertXPath(pXmlDoc,
/w:document/w:body/w:p/w:r/w:drawing/wp:anchor/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/a:lum,
contrast, -7);
+}
+
+
DECLARE_OOXMLEXPORT_TEST(testExportShadow, bnc637947.odt)
{
// The problem was that shadows of shapes from non-OOXML origin were not
exported to DrawingML
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index dcce02f..59027ee 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4192,13 +4192,28 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
completely discarding it.
*/
if ( aRelId.isEmpty() )
-m_pSerializer-singleElementNS( XML_a, XML_blip,
+m_pSerializer-startElementNS( XML_a, XML_blip,
FSEND );
else
-m_pSerializer-singleElementNS( XML_a, XML_blip,
+m_pSerializer-startElementNS( XML_a, XML_blip,
FSNS( XML_r, nImageType ), aRelId.getStr(),
FSEND );
+pItem = 0;
+sal_uInt32 nMode = GRAPHICDRAWMODE_STANDARD;
+
+if ( pGrfNode SfxItemState::SET ==
pGrfNode-GetSwAttrSet().GetItemState(RES_GRFATR_DRAWMODE, true, pItem))
+{
+nMode = static_castconst SfxEnumItem*(pItem)-GetValue();
+if (nMode == GRAPHICDRAWMODE_GREYS)
+m_pSerializer-singleElementNS (XML_a, XML_grayscl, FSEND);
+else if (nMode == GRAPHICDRAWMODE_MONO) //black/white has a 0,5
threshold in LibreOffice
+m_pSerializer-singleElementNS (XML_a, XML_biLevel, XML_thresh,
OString::number(5), FSEND);
+else if (nMode == GRAPHICDRAWMODE_WATERMARK) //watermark has a
brightness/luminance of 0,5
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/customshapepresetdata.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e1f576d9c83f239e1c05ebcd04fa97038942e4d5 Author: Joren De Cuyper jore...@libreoffice.org Date: Sat May 16 13:41:57 2015 +0200 Fix copy-paste error Due the variables above this error, I think this needs to be the .Height, not .Width Change-Id: If796cd1950f59d0e1a6005c1c1185066c688ef55 Reviewed-on: https://gerrit.libreoffice.org/15748 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx index 94d29f7..92252f3 100644 --- a/oox/source/drawingml/customshapepresetdata.cxx +++ b/oox/source/drawingml/customshapepresetdata.cxx @@ -146,7 +146,7 @@ awt::Rectangle lcl_parseRectangle(const OString rValue) aToken = aToken.copy(nIndex); assert(aToken.startsWith(aExpectedHeightPrefix)); nIndex = strlen(aExpectedHeightPrefix); -aRectangle.Width = static_castsal_Int32(aToken.copy(nIndex).toInt32()); +aRectangle.Height = static_castsal_Int32(aToken.copy(nIndex).toInt32()); return aRectangle; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/unotools oox/source sw/qa unotools/source
dev/null |binary
include/unotools/docinfohelper.hxx|3 -
oox/source/core/xmlfilterbase.cxx |5 +--
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |7
unotools/source/config/docinfohelper.cxx | 50 ++
5 files changed, 20 insertions(+), 45 deletions(-)
New commits:
commit 1e49e40c3694cd5750b65fc726b9684ae4185d4f
Author: Joren De Cuyper jore...@libreoffice.org
Date: Fri May 15 13:27:47 2015 +0200
tdf#91064: Revert tdf#89790 DOCX: saving LO version number in app.xml
This reverts commit 480ca7434a330b2678f9ef287cffd6d9cf27bed5.
Change-Id: I69a16425fc36979d49f409bbd7921495a22a35dc
Reviewed-on: https://gerrit.libreoffice.org/15737
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Joren De Cuyper jore...@libreoffice.org
diff --git a/include/unotools/docinfohelper.hxx
b/include/unotools/docinfohelper.hxx
index 320b3b5..ddc28b0 100644
--- a/include/unotools/docinfohelper.hxx
+++ b/include/unotools/docinfohelper.hxx
@@ -29,8 +29,7 @@ class UNOTOOLS_DLLPUBLIC DocInfoHelper
{
public:
static OUString GetGeneratorString();
-static OUString GetApplicationString();
-static OUString GetVersionString();
+
};
} // namespace utl
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index cde386b..4ef16d0 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -58,7 +58,6 @@
#include tools/datetime.hxx
#include com/sun/star/util/Duration.hpp
#include sax/tools/converter.hxx
-#include unotools/configmgr.hxx
using ::com::sun::star::xml::dom::DocumentBuilder;
using ::com::sun::star::xml::dom::XDocument;
@@ -693,9 +692,9 @@ writeAppProperties( XmlFilterBase rSelf, Reference
XDocumentProperties xProp
writeElement( pAppProps, XML_HyperlinksChanged, hyperlinks changed );
writeElement( pAppProps, XML_DigSig,digital signature );
#endif /* def OOXTODO */
-writeElement( pAppProps, XML_Application,
utl::ConfigManager::getProductName() );
-writeElement( pAppProps, XML_AppVersion,
utl::DocInfoHelper::GetVersionString() );
+writeElement( pAppProps, XML_Application,
utl::DocInfoHelper::GetGeneratorString() );
#ifdef OOXTODO
+writeElement( pAppProps, XML_AppVersion,app version );
writeElement( pAppProps, XML_DocSecurity, doc security );
#endif /* def OOXTODO */
diff --git a/sw/qa/extras/ooxmlexport/data/tdf89790.docx
b/sw/qa/extras/ooxmlexport/data/tdf89790.docx
deleted file mode 100644
index 180951e..000
Binary files a/sw/qa/extras/ooxmlexport/data/tdf89790.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 07ba2ae..4cf50c9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -797,13 +797,6 @@ DECLARE_OOXMLEXPORT_TEST(testSectionHeader,
sectionprot.odt)
}
}
-DECLARE_OOXMLEXPORT_TEST(testTdf89790, tdf89790.docx)
-{
-if (xmlDocPtr pXmlDoc = parseExport(docProps/app.xml))
-
- assertXPath(pXmlDoc,
/extended-properties:Properties/extended-properties:AppVersion);
-}
-
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/docinfohelper.cxx
b/unotools/source/config/docinfohelper.cxx
index 0ea143cf..b5d0cf9 100644
--- a/unotools/source/config/docinfohelper.cxx
+++ b/unotools/source/config/docinfohelper.cxx
@@ -41,44 +41,29 @@ OUString DocInfoHelper::GetGeneratorString()
{
aResult.append( aValue.replace( ' ', '_' ) );
aResult.append( '/' );
-}
-
-aValue = GetVersionString();
-if ( !aValue.isEmpty() )
-{
-aResult.append( aValue );
-}
-
-return aResult.makeStringAndClear();
-}
-
-
-OUString DocInfoHelper::GetVersionString()
-{
-OUStringBuffer aResult;
-// version is product_versions_product_extension$platform
-OUString aValue( utl::ConfigManager::getProductVersion() );
-if ( !aValue.isEmpty() )
-{
-aResult.append( aValue.replace( ' ', '_' ) );
-
-aValue = utl::ConfigManager::getProductExtension();
+aValue = utl::ConfigManager::getProductVersion();
if ( !aValue.isEmpty() )
{
aResult.append( aValue.replace( ' ', '_' ) );
+
+aValue = utl::ConfigManager::getProductExtension();
+if ( !aValue.isEmpty() )
+{
+aResult.append( aValue.replace( ' ', '_' ) );
+}
}
-}
-OUString os( $_OS );
-OUString arch( $_ARCH );
-::rtl::Bootstrap::expandMacros(os);
-::rtl::Bootstrap::expandMacros(arch);
-aResult.append( '$' );
-aResult.append( os );
-aResult.append( '_' );
-aResult.append( arch );
-aResult.append( ' ' );
+OUString os( $_OS );
+OUString arch
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 53fe42375e31f09dccefbc43dfeabd988cc52a95
Author: Joren De Cuyper jore...@libreoffice.org
Date: Tue May 12 22:19:06 2015 +0200
tdf#76941 : docx export image greyscale
Change-Id: I104d6db7834b4235248736a9498a0e2a20cc7a43
Reviewed-on: https://gerrit.libreoffice.org/15722
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 701ebc7..62ffaed 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3224,22 +3224,22 @@ void DocxAttributeOutput::TableDefinition(
ww8::WW8TableNodeInfoInner::Pointer_t
uno::Sequencebeans::PropertyValue aTablePosition =
aGrabBagElement-second.getuno::Sequencebeans::PropertyValue ();
for (sal_Int32 i = 0; i aTablePosition.getLength(); ++i)
{
-if (aTablePosition[i].Name == vertAnchor
!aTablePosition[i].Value.getOUString().isEmpty())
+if (aTablePosition[i].Name == vertAnchor)
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8);
attrListTablePos-add( FSNS( XML_w, XML_vertAnchor ),
strTemp.getStr() );
}
-else if (aTablePosition[i].Name == tblpYSpec
!aTablePosition[i].Value.getOUString().isEmpty())
+else if (aTablePosition[i].Name == tblpYSpec)
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8);
attrListTablePos-add( FSNS( XML_w, XML_tblpYSpec ),
strTemp.getStr() );
}
-else if (aTablePosition[i].Name == horzAnchor
!aTablePosition[i].Value.getOUString().isEmpty())
+else if (aTablePosition[i].Name == horzAnchor)
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8);
attrListTablePos-add( FSNS( XML_w, XML_horzAnchor ),
strTemp.getStr() );
}
-else if (aTablePosition[i].Name == tblpXSpec
!aTablePosition[i].Value.getOUString().isEmpty())
+else if (aTablePosition[i].Name == tblpXSpec)
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8);
attrListTablePos-add( FSNS( XML_w, XML_tblpXSpec ),
strTemp.getStr() );
@@ -4193,6 +4193,14 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
FSNS( XML_r, nImageType ), aRelId.getStr(),
FSEND );
+const SfxPoolItem* pItemm;
+if (SfxItemState::SET ==
pOLENode-GetSwAttrSet().GetItemState(RES_GRFATR_DRAWMODE, true, pItemm))
+{
+const SfxEnumItem* nMode = static_castconst SfxEnumItem*(pItemm);
+if (nMode nMode-GetValue() == GRAPHICDRAWMODE_GREYS )
+m_pSerializer-singleElementNS (XML_a, XML_grayscl, FSEND);
+}
+
if (pSdrObj){
WriteSrcRect(pSdrObj);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/GraphicImport.cxx | 219 --
1 file changed, 109 insertions(+), 110 deletions(-)
New commits:
commit ab81e3bff2a1844be67209bc8947d539edbaf8e6
Author: Joren De Cuyper jore...@libreoffice.org
Date: Mon May 11 22:14:41 2015 +0200
tdf#76941 : image greyscale not imported correctly
The eColorMode and other graphic attributes were never checked due to this
statement.
This statement is last altered by 0f0a22ade666d33a10d9c83c0f636be9acf1ed39
This only fixes the import.
Change-Id: I9ba7e745582faf37898f284600d638aa4806a362
Reviewed-on: https://gerrit.libreoffice.org/15710
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 56c3741..a97da37 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1220,126 +1220,125 @@ uno::Reference text::XTextContent
GraphicImport::createGraphicObject( const b
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName(
PROP_SIZE_PROTECTED ),
uno::makeAny(true));
-if (m_pImpl-eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR)
-{
-sal_Int32 nWidth = m_pImpl-nRightPosition -
m_pImpl-nLeftPosition;
-//adjust margins
-if( (m_pImpl-nHoriOrient == text::HoriOrientation::LEFT
+sal_Int32 nWidth = m_pImpl-nRightPosition -
m_pImpl-nLeftPosition;
+//adjust margins
+if( (m_pImpl-nHoriOrient == text::HoriOrientation::LEFT
+(m_pImpl-nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
+m_pImpl-nHoriRelation == text::RelOrientation::FRAME) ) ||
+(m_pImpl-nHoriOrient == text::HoriOrientation::INSIDE
+m_pImpl-nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ))
+m_pImpl-nLeftMargin = 0;
+if((m_pImpl-nHoriOrient == text::HoriOrientation::RIGHT
(m_pImpl-nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
m_pImpl-nHoriRelation == text::RelOrientation::FRAME)
) ||
- (m_pImpl-nHoriOrient == text::HoriOrientation::INSIDE
- m_pImpl-nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ))
-m_pImpl-nLeftMargin = 0;
-if((m_pImpl-nHoriOrient == text::HoriOrientation::RIGHT
-(m_pImpl-nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
-m_pImpl-nHoriRelation ==
text::RelOrientation::FRAME) ) ||
-(m_pImpl-nHoriOrient == text::HoriOrientation::INSIDE
-m_pImpl-nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ))
-m_pImpl-nRightMargin = 0;
-// adjust top/bottom margins
-if( m_pImpl-nVertOrient == text::VertOrientation::TOP
-( m_pImpl-nVertRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
-m_pImpl-nVertRelation ==
text::RelOrientation::PAGE_FRAME))
-m_pImpl-nTopMargin = 0;
-if( m_pImpl-nVertOrient == text::VertOrientation::BOTTOM
-( m_pImpl-nVertRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
-m_pImpl-nVertRelation ==
text::RelOrientation::PAGE_FRAME))
-m_pImpl-nBottomMargin = 0;
-if( m_pImpl-nVertOrient == text::VertOrientation::BOTTOM
-m_pImpl-nVertRelation ==
text::RelOrientation::PAGE_PRINT_AREA )
-m_pImpl-nBottomMargin = 0;
-
-//adjust alignment
-if( m_pImpl-nHoriOrient == text::HoriOrientation::INSIDE
-m_pImpl-nHoriRelation ==
text::RelOrientation::PAGE_FRAME )
-{
-// convert 'left to page' to 'from left -width to page
text area'
-m_pImpl-nHoriOrient = text::HoriOrientation::NONE;
-m_pImpl-nHoriRelation =
text::RelOrientation::PAGE_PRINT_AREA;
-m_pImpl-nLeftPosition = - nWidth;
-}
-else if( m_pImpl-nHoriOrient ==
text::HoriOrientation::OUTSIDE
-m_pImpl-nHoriRelation ==
text::RelOrientation::PAGE_FRAME )
-{
-// convert 'right to page' to 'from left 0 to right page
border'
-m_pImpl-nHoriOrient = text::HoriOrientation::NONE;
-m_pImpl-nHoriRelation = text::RelOrientation::PAGE_RIGHT;
-m_pImpl-nLeftPosition = 0;
-}
-
-m_pImpl-applyPosition(xGraphicObjectProperties
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx|2 ++
sw/source/filter/ww8/docxattributeoutput.cxx |8
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit c2cc63338f3c2f38d0a4f6be822c6cdeedb8213c
Author: Joren De Cuyper jore...@libreoffice.org
Date: Sun May 10 11:24:20 2015 +0200
Don't write empty vertAnchor, HorzAnchor, tblpYSpec and tblpXSpec attributes
This attributes needs a value from the enumeration.
See
http://dev-builds.libreoffice.org/crashtest/6183a945de03dcd5fe0b967d5814a0add954a8c8/validation/docx/fdo43632-1.docx.log
:
(word/document.xml:2 col:70,187) cvc-enumeration-valid: Value '' is not
facet-valid with respect to enumeration
'[inline, top, center, bottom, inside, outside]'. It must be a value from
the enumeration.
(word/document.xml:2 col:70,187) cvc-attribute.3: The value '' of attribute
'w:tblpYSpec' on element 'w:tblpPr'
is not valid with respect to its type, 'ST_YAlign'.
Change-Id: Ibe4ccdf1c273e2ede22dc8865ec91af4de162e10
Reviewed-on: https://gerrit.libreoffice.org/15693
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Joren De Cuyper jore...@libreoffice.org
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 89a1502..07ba2ae 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -234,6 +234,8 @@ DECLARE_OOXMLEXPORT_TEST(testFloatingTable, fdo77887.docx)
assertXPath(pXmlDoc,
/w:document[1]/w:body[1]/w:tbl[1]/w:tblPr[1]/w:tblpPr[1], tblpY, 2266);
assertXPath(pXmlDoc,
/w:document[1]/w:body[1]/w:tbl[1]/w:tblPr[1]/w:tblpPr[1], vertAnchor,
page);
+//make sure not to write empty attributes which requires enumeration
+assertXPathNoAttribute(pXmlDoc,
/w:document[1]/w:body[1]/w:tbl[1]/w:tblPr[1]/w:tblpPr[1], tblpYSpec);
}
DECLARE_OOXMLEXPORT_TEST(testOldComplexMergeRight, tdf90681-1.odt)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index abd7557..9147bfe 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3224,22 +3224,22 @@ void DocxAttributeOutput::TableDefinition(
ww8::WW8TableNodeInfoInner::Pointer_t
uno::Sequencebeans::PropertyValue aTablePosition =
aGrabBagElement-second.getuno::Sequencebeans::PropertyValue ();
for (sal_Int32 i = 0; i aTablePosition.getLength(); ++i)
{
-if (aTablePosition[i].Name == vertAnchor)
+if (aTablePosition[i].Name == vertAnchor
aTablePosition[i].Value.getOUString() != )
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8);
attrListTablePos-add( FSNS( XML_w, XML_vertAnchor ),
strTemp.getStr() );
}
-else if (aTablePosition[i].Name == tblpYSpec)
+else if (aTablePosition[i].Name == tblpYSpec
aTablePosition[i].Value.getOUString() != )
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8);
attrListTablePos-add( FSNS( XML_w, XML_tblpYSpec ),
strTemp.getStr() );
}
-else if (aTablePosition[i].Name == horzAnchor)
+else if (aTablePosition[i].Name == horzAnchor
aTablePosition[i].Value.getOUString() != )
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8);
attrListTablePos-add( FSNS( XML_w, XML_horzAnchor ),
strTemp.getStr() );
}
-else if (aTablePosition[i].Name == tblpXSpec)
+else if (aTablePosition[i].Name == tblpXSpec
aTablePosition[i].Value.getOUString() != )
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8);
attrListTablePos-add( FSNS( XML_w, XML_tblpXSpec ),
strTemp.getStr() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c342295aa8269537494c603429abbec9259f997d Author: Joren De Cuyper jore...@libreoffice.org Date: Sun May 10 19:06:32 2015 +0200 Imagedata test: test fill-attributes are not written at all Change-Id: Iac7e3a14753ee0e0c6d64bda270043462fa3f20a Reviewed-on: https://gerrit.libreoffice.org/15698 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Joren De Cuyper jore...@libreoffice.org diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index a14388d..224e546 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -1115,8 +1115,8 @@ DECLARE_OOXMLEXPORT_TEST(NoFillAttrInImagedata, NoFillAttrInImagedata.docx) if (!pXmlDoc) return; -assertXPath(pXmlDoc, /w:document/w:body/w:p/w:r/mc:AlternateContent[2]/mc:Fallback/w:pict/v:rect/v:imagedata, type, ); -assertXPath(pXmlDoc, /w:document/w:body/w:p/w:r/mc:AlternateContent[2]/mc:Fallback/w:pict/v:rect/v:imagedata, color2, ); +assertXPathNoAttribute(pXmlDoc, /w:document/w:body/w:p/w:r/mc:AlternateContent[2]/mc:Fallback/w:pict/v:rect/v:imagedata, type); +assertXPathNoAttribute(pXmlDoc, /w:document/w:body/w:p/w:r/mc:AlternateContent[2]/mc:Fallback/w:pict/v:rect/v:imagedata, color2); } DECLARE_OOXMLEXPORT_TEST(testBnc837302, bnc837302.docx) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/export/vmlexport.cxx | 22 +++---
1 file changed, 7 insertions(+), 15 deletions(-)
New commits:
commit 8908f10fe3b6566db469a1f2bd2674d8d0425165
Author: Joren De Cuyper jore...@libreoffice.org
Date: Sun May 10 12:47:01 2015 +0200
Code is executed in both cases so take it outside the statement
Change-Id: I8d4c3a62d4e63d2666bfce18d6af772a29e271d4
Reviewed-on: https://gerrit.libreoffice.org/15695
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index a7ed878..9e8e6d2 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -1109,24 +1109,16 @@ sal_Int32 VMLExport::StartShape()
if (!sAnchorId.isEmpty())
m_pShapeAttrList-addNS(XML_wp14, XML_anchorId,
OUStringToOString(sAnchorId, RTL_TEXTENCODING_UTF8));
-if ( nShapeElement = 0 !m_pShapeAttrList-hasAttribute( XML_type ) )
+if ( nShapeElement = 0 !m_pShapeAttrList-hasAttribute( XML_type )
bReferToShapeType )
{
-if ( bReferToShapeType )
-{
-m_pShapeAttrList-add( XML_type, OStringBuffer( 20 )
-.append( shapetype_ ).append( sal_Int32( m_nShapeType ) )
-.makeStringAndClear() );
-}
-
-// start of the shape
-m_pSerializer-startElementNS( XML_v, nShapeElement,
XFastAttributeListRef( m_pShapeAttrList ) );
-}
-else
-{
-// start of the shape
-m_pSerializer-startElementNS( XML_v, nShapeElement,
XFastAttributeListRef( m_pShapeAttrList ) );
+m_pShapeAttrList-add( XML_type, OStringBuffer( 20 )
+.append( shapetype_ ).append( sal_Int32( m_nShapeType ) )
+.makeStringAndClear() );
}
+// start of the shape
+m_pSerializer-startElementNS( XML_v, nShapeElement,
XFastAttributeListRef( m_pShapeAttrList ) );
+
// now check if we have some editeng text (not associated textbox) and we
have a text exporter registered
const SdrTextObj* pTxtObj = PTR_CAST(SdrTextObj, m_pSdrObject);
if (pTxtObj m_pTextExport
msfilter::util::HasTextBoxContent(m_nShapeType)
!IsWaterMarkShape(m_pSdrObject-GetName()) !lcl_isTextBox(m_pSdrObject))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source sw/source
include/svx/dialogs.hrc |1 +
include/svx/srchdlg.hxx |1 +
svx/source/dialog/srchdlg.cxx|2 ++
svx/source/dialog/srchdlg.src|4
sw/source/uibase/uiview/viewsrch.cxx |7 ++-
5 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 69b35cb45375c324c1e28fd4547ce874e4894f30
Author: Joren De Cuyper jore...@libreoffice.org
Date: Sat May 2 17:21:24 2015 +0200
related tdf#88608: find: add string for reaching start of document
If you searched backwards and reached the start of the document,
the text Reached the end of the document was shown.
Change-Id: Ic35884de2f1ada07e76c9c3e27cf6c81c4a83304
Reviewed-on: https://gerrit.libreoffice.org/15597
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index e6abab7..709bd3b 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -227,6 +227,7 @@
#define RID_SVXSTR_CALC_STYLES (RID_SVX_START + 85)
#define RID_SVXSTR_SEARCH_NOT_FOUND (RID_SVX_START + 88)
#define RID_SVXSTR_QUERY_EXIT_RECOVERY (RID_SVX_START + 89)
+#define RID_SVXSTR_SEARCH_START (RID_SVX_START + 90)
// ResIds for the PageDialog
// Strings of the ToolBox-Controls from tbcontrl.cxx
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 0ad7edb..81728a9 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -82,6 +82,7 @@ enum SearchLabel
{
SL_Empty,
SL_End,
+SL_Start,
SL_EndSheet,
SL_NotFound
};
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 415c140..33dbbb8 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2319,6 +2319,8 @@ void SvxSearchDialogWrapper::SetSearchLabel(const
SearchLabel rSL)
OUString sStr;
if (rSL == SL_End)
sStr = SVX_RESSTR(RID_SVXSTR_SEARCH_END);
+else if (rSL == SL_Start)
+sStr = SVX_RESSTR(RID_SVXSTR_SEARCH_START);
else if (rSL == SL_EndSheet)
sStr = SVX_RESSTR(RID_SVXSTR_SEARCH_END_SHEET);
else if (rSL == SL_NotFound)
diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src
index c0fd4e5..e50d3d7 100644
--- a/svx/source/dialog/srchdlg.src
+++ b/svx/source/dialog/srchdlg.src
@@ -54,5 +54,9 @@ String RID_SVXSTR_SEARCH_NOT_FOUND
{
Text [ en-US ] = Search key not found ;
};
+String RID_SVXSTR_SEARCH_START
+{
+Text [ en-US ] = Reached the beginning of the document ;
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uiview/viewsrch.cxx
b/sw/source/uibase/uiview/viewsrch.cxx
index e23c53c..e1deaba 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -544,7 +544,12 @@ bool SwView::SearchAndWrap(bool bApi)
pWait.reset();
#if HAVE_FEATURE_DESKTOP
if (m_bFound)
-SvxSearchDialogWrapper::SetSearchLabel(SL_End);
+{
+if (!bSrchBkwrd)
+SvxSearchDialogWrapper::SetSearchLabel(SL_End);
+else
+SvxSearchDialogWrapper::SetSearchLabel(SL_Start);
+}
else if(!bApi)
SvxSearchDialogWrapper::SetSearchLabel(SL_NotFound);
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 4a0cf72f40e9545d367f48617c2834146d7bec1a
Author: Joren De Cuyper jore...@libreoffice.org
Date: Sat May 2 17:48:39 2015 +0200
tdf#88608: clear SearchLabel when altering the search string
Change-Id: Ifc31fbd1ddee1e055bb62b9ad098ae9410758147
Reviewed-on: https://gerrit.libreoffice.org/15598
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index a5f8b17..ea9519f 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -42,6 +42,7 @@
#include osl/mutex.hxx
#include rtl/ref.hxx
#include rtl/instance.hxx
+#include svx/srchdlg.hxx
#include vcl/fixed.hxx
@@ -195,6 +196,11 @@ bool FindTextFieldControl::PreNotify( NotifyEvent rNEvt )
{
case MouseNotifyEvent::KEYINPUT:
{
+// Clear SearchLabel when altering the search string
+#if HAVE_FEATURE_DESKTOP
+SvxSearchDialogWrapper::SetSearchLabel(SL_Empty);
+#endif
+
const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
bool bShift = pKeyEvent-GetKeyCode().IsShift();
bool bMod1 = pKeyEvent-GetKeyCode().IsMod1();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/export/vmlexport.cxx | 77 +++
sw/qa/extras/ooxmlexport/data/NoFillAttrInImagedata.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx| 11 ++
3 files changed, 51 insertions(+), 37 deletions(-)
New commits:
commit 101cc7a8a471b50947ccca0711417b2c0f3ef574
Author: Joren De Cuyper jore...@libreoffice.org
Date: Thu May 7 21:39:49 2015 +0200
Do not write v:fill properties on export of imagedata
See validation log of fdo73214:
ERROR cvc-complex-type.3.2.2: Attribute 'type' is not allowed to appear in
element 'v:imagedata'.
ERROR cvc-complex-type.3.2.2: Attribute 'color2' is not allowed to appear
in element 'v:imagedata'.
http://dev-builds.libreoffice.org/crashtest/d879d5346b525c478e93363b7ec06e797ce01461/validation/docx/fdo73214-1.docx.log
Change-Id: I99eacc05ed28c3cd848326fd08f3668a1ce0f4fb
Reviewed-on: https://gerrit.libreoffice.org/15668
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 570416d..a7ed878 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -562,39 +562,6 @@ void VMLExport::Commit( EscherPropertyContainer rProps,
const Rectangle rRect
sal_uInt32 nValue;
sax_fastparser::FastAttributeList *pAttrList =
FastSerializerHelper::createAttrList();
-if ( rProps.GetOpt( ESCHER_Prop_fillType, nValue ) )
-{
-const char *pFillType = NULL;
-switch ( nValue )
-{
-case ESCHER_FillSolid: pFillType = solid;
break;
-// TODO case ESCHER_FillPattern: pFillType =
; break;
-case ESCHER_FillTexture: pFillType = tile;
break;
-// TODO case ESCHER_FillPicture: pFillType =
; break;
-// TODO case ESCHER_FillShade: pFillType =
; break;
-// TODO case ESCHER_FillShadeCenter: pFillType =
; break;
-// TODO case ESCHER_FillShadeShape: pFillType =
; break;
-// TODO case ESCHER_FillShadeScale: pFillType =
; break;
-// TODO case ESCHER_FillShadeTitle: pFillType =
; break;
-// TODO case ESCHER_FillBackground: pFillType =
; break;
-default:
-#if OSL_DEBUG_LEVEL 0
-fprintf( stderr, TODO: unhandled fill type\n
);
-#endif
-break;
-}
-if ( pFillType )
-pAttrList-add( XML_type, pFillType );
-}
-else if (!rProps.GetOpt(ESCHER_Prop_fillColor, nValue))
-pAttrList-add( XML_on, false );
-
-if ( rProps.GetOpt( ESCHER_Prop_fillColor, nValue ) )
-impl_AddColor( m_pShapeAttrList, XML_fillcolor, nValue
);
-
-if ( rProps.GetOpt( ESCHER_Prop_fillBackColor, nValue ) )
-impl_AddColor( pAttrList, XML_color2, nValue );
-
bool imageData = false;
EscherPropSortStruct aStruct;
if ( rProps.GetOpt( ESCHER_Prop_fillBlip, aStruct )
m_pTextExport)
@@ -613,14 +580,50 @@ void VMLExport::Commit( EscherPropertyContainer rProps,
const Rectangle rRect
if ( rProps.GetOpt( ESCHER_Prop_fNoFillHitTest, nValue ) )
impl_AddBool( pAttrList, FSNS(XML_o,
XML_detectmouseclick), nValue != 0 );
-if (rProps.GetOpt(ESCHER_Prop_fillOpacity, nValue))
-// Partly undo the transformation at the end of
EscherPropertyContainer::CreateFillProperties(): VML opacity is 0..1.
-pAttrList-add(XML_opacity,
OString::number(double((nValue * 100) 16) / 100));
-
if (imageData)
m_pSerializer-singleElementNS( XML_v, XML_imagedata,
XFastAttributeListRef( pAttrList ) );
else
+{
+if ( rProps.GetOpt( ESCHER_Prop_fillType, nValue ) )
+{
+const char *pFillType = NULL;
+switch ( nValue )
+{
+case ESCHER_FillSolid: pFillType =
solid; break;
+// TODO case ESCHER_FillPattern: pFillType
= ; break;
+case ESCHER_FillTexture: pFillType =
tile; break
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 442701de0c110ca58ff41abe6bf7ec4496f8457d
Author: Joren De Cuyper jore...@libreoffice.org
Date: Sat May 9 18:56:40 2015 +0200
Don't write empty value when exporting grab-bagged w:docPartUnique
See
http://dev-builds.libreoffice.org/crashtest/e658cb4d5ce49d3a3c6acc63155974b5ff8490c7/validation/docx/fdo33590-2.docx.log
(footer1.xml:2 col:890) cvc-datatype-valid.1.2.1: '' is not a valid value
for 'boolean'.
(footer1.xml:2 col:890) cvc-attribute.3: The value '' of attribute 'w:val'
on
element 'w:docPartUnique' is not valid with respect to its type, 'ST_OnOff'.
Original document:
w:docPartObj
w:docPartGallery w:val=Page Numbers (Bottom of Page)/
w:docPartUnique/
/w:docPartObj
RT document:
w:docPartObj
w:docPartGallery w:val=Page Numbers (Bottom of Page)/
w:docPartUnique w:val=/
/w:docPartObj
Change-Id: If41af8f4bca99fba4d3ad0c966c2345f87ea422a
solution: if value is empty, export it as true (default ST-OnOff value)
Reviewed-on: https://gerrit.libreoffice.org/15686
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index bc5d40f..abd7557 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8004,7 +8004,12 @@ void DocxAttributeOutput::ParaGrabBag(const
SfxGrabBagItem rItem)
FSNS( XML_w, XML_docPartCategory ),
OUStringToOString( sValue,
RTL_TEXTENCODING_UTF8 ).getStr() );
else if (aGrabBag[j].Name ==
ooxml:CT_SdtDocPart_docPartUnique)
-AddToAttrList( m_pParagraphSdtPrTokenChildren,
FSNS( XML_w, XML_docPartUnique ), );
+{
+if (sValue.isEmpty())
+sValue = true;
+AddToAttrList( m_pParagraphSdtPrTokenChildren,
FSNS( XML_w, XML_docPartUnique ),
+OUStringToOString( sValue, RTL_TEXTENCODING_UTF8
).getStr() );
+}
}
}
else if (aPropertyValue.Name == ooxml:CT_SdtPr_equation)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/undo/undo.hrc | 125 +++ sw/source/core/undo/undo.src | 488 ++- 2 files changed, 612 insertions(+), 1 deletion(-) New commits: commit d7336b91f0539751c1e955ecbbf3b38991c87387 Author: Joren De Cuyper jore...@libreoffice.org Date: Mon May 4 19:00:44 2015 +0200 Revert Delete unused strings in undo.src and undo.hrc This reverts commit 4c07124cf4f7684d271d0e71a095c67e0f988e45. It looks like these strings are used via an iteration in docundo.cxx So, restore them. Change-Id: I1b0428de3d56b04908284c94b47dc6021375cc8e Reviewed-on: https://gerrit.libreoffice.org/15629 Reviewed-by: Joren De Cuyper jore...@libreoffice.org Tested-by: Joren De Cuyper jore...@libreoffice.org diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc index d17c13e..f258063 100644 --- a/sw/source/core/undo/undo.hrc +++ b/sw/source/core/undo/undo.hrc @@ -20,13 +20,123 @@ #include rcid.hrc // Undo #define UNDO_BASE (RC_WRTSH_BEGIN + 8) +#define STR_CANT_UNDO (UNDO_BASE + 0) // im enun folgen hier START END fuer die Klammerungen, +// Id's fuer die Undo/Redo/Repeat faehigen Funktionen +#define STR_DELETE_UNDO (UNDO_BASE + 3) +#define STR_INSERT_UNDO (UNDO_BASE + 4) +#define STR_OVR_UNDO(UNDO_BASE + 5) +#define STR_SPLITNODE_UNDO (UNDO_BASE + 6) +#define STR_INSATTR_UNDO(UNDO_BASE + 7) +#define STR_SETFMTCOLL_UNDO (UNDO_BASE + 8) +#define STR_RESET_ATTR_UNDO (UNDO_BASE + 9) +#define STR_INSFMT_ATTR_UNDO(UNDO_BASE +10) +#define STR_INSERT_DOC_UNDO (UNDO_BASE +11) +#define STR_COPY_UNDO (UNDO_BASE +12) +#define STR_INSTABLE_UNDO (UNDO_BASE +13) +#define STR_TABLETOTEXT_UNDO(UNDO_BASE +14) +#define STR_TEXTTOTABLE_UNDO(UNDO_BASE +15) +#define STR_SORT_TXT(UNDO_BASE +16) +#define STR_INSERTFLY (UNDO_BASE +17) +#define STR_TABLEHEADLINE (UNDO_BASE +18) +#define STR_INSERTSECTION (UNDO_BASE +19) +#define STR_OUTLINE_LR (UNDO_BASE +20) +#define STR_OUTLINE_UD (UNDO_BASE +21) +#define STR_INSNUM (UNDO_BASE +22) +#define STR_NUMUP (UNDO_BASE +23) +#define STR_MOVENUM (UNDO_BASE +24) +#define STR_INSERTDRAW (UNDO_BASE +25) +#define STR_NUMORNONUM (UNDO_BASE +26) +#define STR_INC_LEFTMARGIN (UNDO_BASE +27) +#define STR_DEC_LEFTMARGIN (UNDO_BASE +28) +#define STR_INSERTLABEL (UNDO_BASE +29) +#define STR_SETNUMRULESTART (UNDO_BASE +30) +#define STR_CHANGEFTN (UNDO_BASE +31) +#define STR_REDLINE (UNDO_BASE +32) +#define STR_ACCEPT_REDLINE (UNDO_BASE +33) +#define STR_REJECT_REDLINE (UNDO_BASE +34) +#define STR_SPLIT_TABLE (UNDO_BASE +35) +#define STR_DONTEXPAND (UNDO_BASE +36) +#define STR_AUTOCORRECT (UNDO_BASE +37) +#define STR_MERGE_TABLE (UNDO_BASE +38) +#define STR_TRANSLITERATE (UNDO_BASE +39) +#define STR_PASTE_CLIPBOARD_UNDO(UNDO_BASE +40) +#define STR_TYPING_UNDO (UNDO_BASE +41) + #define STR_REPEAT_DUMMY_9 (UNDO_BASE +45) // !! umsetzen !!! umsetzen !!! umsetzen #define CORE_REPEAT_END STR_REPEAT_DUMMY_9// umsetzen !!! +// Id's nur fuer die Undo/Redo faehigen Funktionen +#define STR_MOVE_UNDO (CORE_REPEAT_END + 1) +#define STR_INSERT_GLOSSARY (CORE_REPEAT_END + 2) +#define STR_DELBOOKMARK (CORE_REPEAT_END + 3) +#define STR_INSBOOKMARK (CORE_REPEAT_END + 4) +#define STR_SORT_TBL(CORE_REPEAT_END + 5) +#define STR_DELETEFLY (CORE_REPEAT_END + 6) +#define STR_AUTOFORMAT (CORE_REPEAT_END + 7) +#define STR_REPLACE (CORE_REPEAT_END + 8) +#define STR_DELETESECTION (CORE_REPEAT_END + 9) +#define STR_CHANGESECTION (CORE_REPEAT_END +10) +#define STR_CHANGESECTPASSWD(CORE_REPEAT_END +11) +#define STR_CHANGEDEFATTR (CORE_REPEAT_END +12) +#define STR_DELNUM (CORE_REPEAT_END +13) +#define STR_DRAWUNDO(CORE_REPEAT_END +14) +#define STR_DRAWGROUP (CORE_REPEAT_END +15) +#define STR_DRAWUNGROUP (CORE_REPEAT_END +16) +#define STR_DRAWDELETE (CORE_REPEAT_END +17) +#define STR_REREAD (CORE_REPEAT_END +18) +#define STR_DELGRF (CORE_REPEAT_END +19) +#define STR_DELOLE (CORE_REPEAT_END +20) +#define STR_TABLE_ATTR (CORE_REPEAT_END +21) +#define STR_TABLE_AUTOFMT (CORE_REPEAT_END +22) +#define STR_TABLE_INSCOL(CORE_REPEAT_END +23) +#define
[Libreoffice-commits] core.git: 2 commits - sfx2/inc sfx2/source
sfx2/inc/filedlghelper.hrc | 14 -- sfx2/source/dialog/filedlghelper.src | 70 -- sfx2/source/doc/doc.hrc | 55 --- sfx2/source/doc/doc.src | 173 --- 4 files changed, 1 insertion(+), 311 deletions(-) New commits: commit b3d5cba226cd14800345641b05df1b4d3f977542 Author: Joren De Cuyper jore...@libreoffice.org Date: Sun May 3 19:43:34 2015 +0200 Delete unused strings in doc.src and doc.hrc These strings were only used in the src and hrc file. No usecase in any .cxx file found. Change-Id: Ib590629ee4c7a488254a18398ff92e9259f4589c Reviewed-on: https://gerrit.libreoffice.org/15612 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc index 4f16fdc..a2e8f68 100644 --- a/sfx2/source/doc/doc.hrc +++ b/sfx2/source/doc/doc.hrc @@ -29,57 +29,18 @@ #define STR_ERROR_PRINTER_BUSY (RID_SFX_DOC_START+ 1) #define STR_NOSTARTPRINTER (RID_SFX_DOC_START+ 2) -#define STR_DELETE_REGION (RID_SFX_DOC_START+14) -#define STR_DELETE_TEMPLATE (RID_SFX_DOC_START+15) - -#define BMP_STYLES_CLOSED (RID_SFX_DOC_START+ 0) -#define BMP_STYLES_OPENED (RID_SFX_DOC_START+ 1) - -#define BMP_STYLES_FAMILY1 (RID_SFX_DOC_START+ 2) -#define BMP_STYLES_FAMILY2 (RID_SFX_DOC_START+ 3) -#define BMP_STYLES_FAMILY3 (RID_SFX_DOC_START+ 4) -#define BMP_STYLES_FAMILY4 (RID_SFX_DOC_START+ 5) - -#define STR_STYLES (RID_SFX_DOC_START+ 18) -#define STR_MACROS (RID_SFX_DOC_START+ 19) - -#define STR_PRINT_STYLES(RID_SFX_DOC_START+ 20) -#define STR_PRINT_STYLES_HEADER (RID_SFX_DOC_START+ 21) #define STR_BACKUP_COPY (RID_SFX_DOC_START+ 23) #define STR_ERROR_SAVE (RID_SFX_DOC_START+ 27) #define STR_TEMPLATE_FILTER (RID_SFX_DOC_START+ 28) -#define STR_ERROR_COPY_TEMPLATE (RID_SFX_DOC_START+ 29) - -#define STR_ERROR_DELETE_TEMPLATE (RID_SFX_DOC_START+ 30) -#define STR_ERROR_MOVE_TEMPLATE (RID_SFX_DOC_START+ 32) -#define STR_ERROR_SAVE_TEMPLATE (RID_SFX_DOC_START+ 34) -#define STR_CONFIG (RID_SFX_DOC_START+ 37) -#define STR_QUERY_DEFAULT_TEMPLATE (RID_SFX_DOC_START+ 39) -#define STR_ERROR_NOSTORAGE (RID_SFX_DOC_START+ 42) -#define STR_QUERY_MUSTOWNFORMAT (RID_SFX_DOC_START+ 44) + #define STR_SAVEDOC (RID_SFX_DOC_START+ 45) #define STR_UPDATEDOC (RID_SFX_DOC_START+ 46) #define STR_SAVEASDOC (RID_SFX_DOC_START+ 47) #define STR_CLOSEDOC(RID_SFX_DOC_START+ 49) #define STR_CLOSEDOC_ANDRETURN (RID_SFX_DOC_START+ 50) -#define STR_WIZARD (RID_SFX_DOC_START+ 51) -#define RID_STR_FILTCONFIG (RID_SFX_DOC_START+ 52) -#define RID_STR_FILTBASIC (RID_SFX_DOC_START+ 53) -#define RID_STR_WARNSTYLEOVERWRITE (RID_SFX_DOC_START+ 54) #define STR_SAVEACOPY (RID_SFX_DOC_START+ 55) -#define RID_OFFICEFILTER(RID_SFX_DOC_START+ 59) -#define RID_OFFICEFILTER_WILDCARD (RID_SFX_DOC_START+ 60) -#define RID_OFFICEFILTER_MACTYPE(RID_SFX_DOC_START+ 61) -#define RID_OFFICEFILTER_OS2TYPE(RID_SFX_DOC_START+ 62) -#define STR_FRAMEOBJECT_PROPERTIES (RID_SFX_DOC_START+ 63) - -#define STR_FSET_FILTERNAME0(RID_SFX_DOC_START+ 64) -#define STR_FSET_FILTERNAME1(RID_SFX_DOC_START+ 65) - -#define STR_TEMPL_MOVED (RID_SFX_DOC_START+ 66) -#define STR_TEMPL_RESET (RID_SFX_DOC_START+ 67) #define STR_AUTOMATICVERSION(RID_SFX_DOC_START+ 68) #define STR_DOCTYPENAME_SW (RID_SFX_DOC_START+ 69) @@ -91,25 +52,11 @@ #define STR_DOCTYPENAME_MESSAGE (RID_SFX_DOC_START+ 75) #define RID_STR_NEW_TASK(RID_SFX_DOC_START+ 76) -#define STR_PACKNGO_NOACCESS(RID_SFX_DOC_START+ 79) -#define STR_PACKNGO_NEWMEDIUM (RID_SFX_DOC_START+ 80) - #define TEMPLATE_LONG_NAMES_ARY (RID_SFX_DOC_START+ 81) #define TEMPLATE_SHORT_NAMES_ARY(RID_SFX_DOC_START+ 82) #define RID_CNT_STR_WAITING (RID_SFX_DOC_START+ 83) -#define STR_OBJECT (RID_SFX_DOC_START+ 84) - -#define BTN_OK (RID_SFX_DOC_START+88) -#define BTN_CANCEL (RID_SFX_DOC_START+89) -#define FT_OK (RID_SFX_DOC_START+90) -#define FT_CANCEL
[Libreoffice-commits] core.git: sw/source
sw/source/core/undo/undo.hrc | 125 --- sw/source/core/undo/undo.src | 488 --- 2 files changed, 1 insertion(+), 612 deletions(-) New commits: commit 4c07124cf4f7684d271d0e71a095c67e0f988e45 Author: Joren De Cuyper jore...@libreoffice.org Date: Sun May 3 21:29:11 2015 +0200 Delete unused strings in undo.src and undo.hrc These strings were only used in the src and hrc file. No usecase in any .cxx file found. Change-Id: I079f42818bf397c5226a7c1f9d2db37b841437c6 Reviewed-on: https://gerrit.libreoffice.org/15613 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc index f258063..d17c13e 100644 --- a/sw/source/core/undo/undo.hrc +++ b/sw/source/core/undo/undo.hrc @@ -20,123 +20,13 @@ #include rcid.hrc // Undo #define UNDO_BASE (RC_WRTSH_BEGIN + 8) -#define STR_CANT_UNDO (UNDO_BASE + 0) // im enun folgen hier START END fuer die Klammerungen, -// Id's fuer die Undo/Redo/Repeat faehigen Funktionen -#define STR_DELETE_UNDO (UNDO_BASE + 3) -#define STR_INSERT_UNDO (UNDO_BASE + 4) -#define STR_OVR_UNDO(UNDO_BASE + 5) -#define STR_SPLITNODE_UNDO (UNDO_BASE + 6) -#define STR_INSATTR_UNDO(UNDO_BASE + 7) -#define STR_SETFMTCOLL_UNDO (UNDO_BASE + 8) -#define STR_RESET_ATTR_UNDO (UNDO_BASE + 9) -#define STR_INSFMT_ATTR_UNDO(UNDO_BASE +10) -#define STR_INSERT_DOC_UNDO (UNDO_BASE +11) -#define STR_COPY_UNDO (UNDO_BASE +12) -#define STR_INSTABLE_UNDO (UNDO_BASE +13) -#define STR_TABLETOTEXT_UNDO(UNDO_BASE +14) -#define STR_TEXTTOTABLE_UNDO(UNDO_BASE +15) -#define STR_SORT_TXT(UNDO_BASE +16) -#define STR_INSERTFLY (UNDO_BASE +17) -#define STR_TABLEHEADLINE (UNDO_BASE +18) -#define STR_INSERTSECTION (UNDO_BASE +19) -#define STR_OUTLINE_LR (UNDO_BASE +20) -#define STR_OUTLINE_UD (UNDO_BASE +21) -#define STR_INSNUM (UNDO_BASE +22) -#define STR_NUMUP (UNDO_BASE +23) -#define STR_MOVENUM (UNDO_BASE +24) -#define STR_INSERTDRAW (UNDO_BASE +25) -#define STR_NUMORNONUM (UNDO_BASE +26) -#define STR_INC_LEFTMARGIN (UNDO_BASE +27) -#define STR_DEC_LEFTMARGIN (UNDO_BASE +28) -#define STR_INSERTLABEL (UNDO_BASE +29) -#define STR_SETNUMRULESTART (UNDO_BASE +30) -#define STR_CHANGEFTN (UNDO_BASE +31) -#define STR_REDLINE (UNDO_BASE +32) -#define STR_ACCEPT_REDLINE (UNDO_BASE +33) -#define STR_REJECT_REDLINE (UNDO_BASE +34) -#define STR_SPLIT_TABLE (UNDO_BASE +35) -#define STR_DONTEXPAND (UNDO_BASE +36) -#define STR_AUTOCORRECT (UNDO_BASE +37) -#define STR_MERGE_TABLE (UNDO_BASE +38) -#define STR_TRANSLITERATE (UNDO_BASE +39) -#define STR_PASTE_CLIPBOARD_UNDO(UNDO_BASE +40) -#define STR_TYPING_UNDO (UNDO_BASE +41) - #define STR_REPEAT_DUMMY_9 (UNDO_BASE +45) // !! umsetzen !!! umsetzen !!! umsetzen #define CORE_REPEAT_END STR_REPEAT_DUMMY_9// umsetzen !!! -// Id's nur fuer die Undo/Redo faehigen Funktionen -#define STR_MOVE_UNDO (CORE_REPEAT_END + 1) -#define STR_INSERT_GLOSSARY (CORE_REPEAT_END + 2) -#define STR_DELBOOKMARK (CORE_REPEAT_END + 3) -#define STR_INSBOOKMARK (CORE_REPEAT_END + 4) -#define STR_SORT_TBL(CORE_REPEAT_END + 5) -#define STR_DELETEFLY (CORE_REPEAT_END + 6) -#define STR_AUTOFORMAT (CORE_REPEAT_END + 7) -#define STR_REPLACE (CORE_REPEAT_END + 8) -#define STR_DELETESECTION (CORE_REPEAT_END + 9) -#define STR_CHANGESECTION (CORE_REPEAT_END +10) -#define STR_CHANGESECTPASSWD(CORE_REPEAT_END +11) -#define STR_CHANGEDEFATTR (CORE_REPEAT_END +12) -#define STR_DELNUM (CORE_REPEAT_END +13) -#define STR_DRAWUNDO(CORE_REPEAT_END +14) -#define STR_DRAWGROUP (CORE_REPEAT_END +15) -#define STR_DRAWUNGROUP (CORE_REPEAT_END +16) -#define STR_DRAWDELETE (CORE_REPEAT_END +17) -#define STR_REREAD (CORE_REPEAT_END +18) -#define STR_DELGRF (CORE_REPEAT_END +19) -#define STR_DELOLE (CORE_REPEAT_END +20) -#define STR_TABLE_ATTR (CORE_REPEAT_END +21) -#define STR_TABLE_AUTOFMT (CORE_REPEAT_END +22) -#define STR_TABLE_INSCOL(CORE_REPEAT_END +23) -#define STR_TABLE_INSROW(CORE_REPEAT_END +24) -#define STR_TABLE_DELBOX
[Libreoffice-commits] core.git: Changes to 'refs/changes/56/1956/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/42/3042/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/56/1956/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/10304/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/42/3042/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/94/10594/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/58/9858/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/94/10594/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/10304/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/58/9858/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/43/3043/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/58/9858/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/72/2572/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/72/2572/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/68/2568/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/58/9858/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/69/7969/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/38/3338/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/38/3338/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/25/10625/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/94/3994/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/7924/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/2589/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/43/3043/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/84/7884/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/58/9858/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/2589/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/7924/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/25/10625/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/43/9843/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/26/10326/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/2589/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/25/7925/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/25/10625/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/72/2972/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/72/2572/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/7902/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/26/10326/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/55/1955/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/7902/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/2589/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/43/9843/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/55/1955/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/2971/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/61/5261/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/7902/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/75/2575/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/7902/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/74/7974/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/72/2972/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/38/3338/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/82/1782/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/17/4217/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/7902/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/41/4041/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/06/4006/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/67/2067/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/61/5261/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/3853/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/62/3062/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/4004/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/74/7974/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/76/2276/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/76/2276/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/18/4218/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/18/4218/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/91/3291/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/01/10601/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/51/10651/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/82/1782/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/90/5290/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/41/3041/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/41/3041/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/62/3062/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/17/4217/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/94/3994/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/37/3837/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/3853/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/6321/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/83/9883/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/4004/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/6321/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/91/3291/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
