[Libreoffice-commits] core.git: vcl/source
vcl/source/window/abstdlg.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 7e9ac5952711400ad856b3328c5cc00c05cec6f2
Author: Tor Lillqvist
Date: Tue Feb 11 16:56:34 2014 +0200
We don't need CreateDialogFactory() for non-DESKTOP, I think
Change-Id: Iced798f51fc2a46ede0c8e67d63941eca69ad208
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx
index 09f357d..7cb7cdc 100644
--- a/vcl/source/window/abstdlg.cxx
+++ b/vcl/source/window/abstdlg.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
#include
#include
@@ -33,6 +34,7 @@ extern "C" VclAbstractDialogFactory* CreateDialogFactory();
VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
{
FuncPtrCreateDialogFactory fp = 0;
+#if HAVE_FEATURE_DESKTOP
#ifndef DISABLE_DYNLOADING
static ::osl::Module aDialogLibrary;
if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule,
OUString( CUI_DLL_NAME ),
@@ -42,6 +44,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
#else
fp = CreateDialogFactory;
#endif
+#endif
if ( fp )
return fp();
return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/filter/inc/numberformatsbuffer.hxx |2 -
sc/source/filter/inc/stylesbuffer.hxx|4 +-
sc/source/filter/oox/stylesbuffer.cxx| 47 +++
3 files changed, 38 insertions(+), 15 deletions(-)
New commits:
commit ee12691374f68968e2fdf87ee4bfb736080daa7e
Author: Kohei Yoshida
Date: Mon Feb 10 16:03:54 2014 -0500
cp#100030: Use internal API to fill dxf styles during xlsx import.
It's faster, and it actually prevents a bug where styles fail to get
set when the document contains at least one protected sheet.
Change-Id: I9a5d7250ca44dd46364ab62f2e0130e967427c66
(cherry picked from commit d12c0e5d36cc106cb4f9a27dba2f29c10b5d6f93)
Reviewed-on: https://gerrit.libreoffice.org/7983
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx
b/sc/source/filter/inc/numberformatsbuffer.hxx
index 32c3611..52a68f0 100644
--- a/sc/source/filter/inc/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -77,7 +77,7 @@ public:
sal_Int32 finalizeImport(
const ::com::sun::star::uno::Reference<
::com::sun::star::util::XNumberFormats >& rxNumFmts,
const ::com::sun::star::lang::Locale& rFromLocale
);
-voidfillToItemSet( SfxItemSet& rItemSet, bool
bSkipPoolDefs ) const;
+void fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false )
const;
/** Writes the number format to the passed property map. */
voidwriteToPropertyMap( PropertyMap& rPropMap ) const;
diff --git a/sc/source/filter/inc/stylesbuffer.hxx
b/sc/source/filter/inc/stylesbuffer.hxx
index cbedfb3..2694784 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -520,7 +520,7 @@ public:
/** Returns the converted API border data struct. */
inline const ApiBorderData& getApiData() const { return maApiData; }
-voidfillToItemSet( SfxItemSet& rItemSet, bool
bSkipPoolDefs ) const;
+void fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false )
const;
/** Writes all border attributes to the passed property map. */
voidwriteToPropertyMap( PropertyMap& rPropMap ) const;
@@ -772,6 +772,8 @@ public:
/** Writes all formatting attributes to the passed property set. */
voidwriteToPropertySet( PropertySet& rPropSet ) const;
+void fillToItemSet( SfxItemSet& rSet ) const;
+
private:
FontRef mxFont; /// Font data.
NumberFormatRef mxNumFmt; /// Number format data.
diff --git a/sc/source/filter/oox/stylesbuffer.cxx
b/sc/source/filter/oox/stylesbuffer.cxx
index 96333d6..ba102a9 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2625,6 +2625,22 @@ void Dxf::writeToPropertySet( PropertySet& rPropSet )
const
rPropSet.setProperties( aPropMap );
}
+void Dxf::fillToItemSet( SfxItemSet& rSet ) const
+{
+if (mxFont)
+mxFont->fillToItemSet(rSet, FONT_PROPTYPE_CELL);
+if (mxNumFmt)
+mxNumFmt->fillToItemSet(rSet);
+if (mxAlignment)
+mxAlignment->fillToItemSet(rSet);
+if (mxProtection)
+mxProtection->fillToItemSet(rSet);
+if (mxBorder)
+mxBorder->fillToItemSet(rSet);
+if (mxFill)
+mxFill->fillToItemSet(rSet);
+}
+
//
namespace {
@@ -3261,21 +3277,26 @@ OUString StylesBuffer::createCellStyle( sal_Int32 nXfId
) const
OUString StylesBuffer::createDxfStyle( sal_Int32 nDxfId ) const
{
OUString& rStyleName = maDxfStyles[ nDxfId ];
-if( rStyleName.isEmpty() )
+if (!rStyleName.isEmpty())
+return rStyleName;
+
+if (Dxf* pDxf = maDxfs.get(nDxfId).get())
{
-if( Dxf* pDxf = maDxfs.get( nDxfId ).get() )
-{
-rStyleName = OUStringBuffer( "ConditionalStyle_" ).append( nDxfId
+ 1 ).makeStringAndClear();
-// create the style sheet (this may change rStyleName if such a
style already exists)
-Reference< XStyle > xStyle = createStyleObject( rStyleName, false
);
-// write style formatting properties
-PropertySet aPropSet( xStyle );
-pDxf->writeToPropertySet( aPropSet );
-}
-// on error: fallback to default style
-if( rStyleName.isEmpty() )
-rStyleName = maCellStyles.getDefaultStyleName();
+rStyleName = OUStringBuffer("ConditionalStyle_").append(nDxfId +
1).makeStringAndClear();
+
+// Create a cell style. This may overwrite an existing style if
+// one with the same name exists.
+SfxItemSet& rStyleItemSet =
+ScfTools::MakeCellStyleSheet(
+*getScDocument().GetStyleSheetPool(), rStyleName,
true).GetItemSet(
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 chtfn changed: What|Removed |Added Depends on||34957 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 chtfn changed: What|Removed |Added Depends on|34957 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 chtfn changed: What|Removed |Added Depends on||52226 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 chtfn changed: What|Removed |Added Depends on|52226 | --- Comment #138 from chtfn --- Added Bug 52226 - "FILESAVE Images in .docx and .xlsx files show "Read-Error", probably corrupted by auto-save" Moved from MAB 4.0 since 4.0 reached EOL. Pretty big show-stopper as it seriously impedes collaborating with colleagues who decide to work with a docx file. Has been a MAB since 3.6. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #48 from Commit Notification --- Alexandre Vicenzi committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=064c628842161c88814ed175bf44c4eda5061f37 fdo#63154 Remove unused solar.h ref in vcl, basctl, desktop.. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basctl/source desktop/source include/drawinglayer UnoControls/source vcl/inc vcl/source
UnoControls/source/controls/progressmonitor.cxx | 104 ---
basctl/source/basicide/bastype2.hxx |5
desktop/source/deployment/gui/dp_gui_dependencydialog.cxx|1
desktop/source/deployment/gui/dp_gui_updatedata.hxx |1
desktop/source/deployment/gui/dp_gui_updatedialog.hxx|1
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 16 -
include/drawinglayer/primitive2d/textlayoutdevice.hxx|6
vcl/inc/unx/salinst.h|1
vcl/source/window/splitwin.cxx |3
9 files changed, 3 insertions(+), 135 deletions(-)
New commits:
commit 064c628842161c88814ed175bf44c4eda5061f37
Author: Alexandre Vicenzi
Date: Tue Feb 11 22:19:45 2014 -0200
fdo#63154 Remove unused solar.h ref in vcl, basctl, desktop..
Change-Id: Ic0187495d8f7f64ddf9d3c202ec41201c9ac3a8c
Reviewed-on: https://gerrit.libreoffice.org/8001
Tested-by: LibreOffice gerrit bot
Reviewed-by: Marcos Souza
diff --git a/UnoControls/source/controls/progressmonitor.cxx
b/UnoControls/source/controls/progressmonitor.cxx
index ab4dd8a..c288632 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -27,7 +27,6 @@
#include
#include
#include
-#include
#include
#include "progressbar.hxx"
@@ -44,10 +43,6 @@ using ::std::find;
namespace unocontrols{
-//
-// construct/destruct
-//
-
ProgressMonitor::ProgressMonitor( const css::uno::Reference< XComponentContext
>& rxContext )
: BaseContainerControl ( rxContext )
{
@@ -107,10 +102,7 @@ ProgressMonitor::~ProgressMonitor()
impl_cleanMemory () ;
}
-//
// XInterface
-//
-
Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw(
RuntimeException )
{
// Attention:
@@ -132,10 +124,7 @@ Any SAL_CALL ProgressMonitor::queryInterface( const Type&
rType ) throw( Runtime
return aReturn ;
}
-//
// XInterface
-//
-
void SAL_CALL ProgressMonitor::acquire() throw()
{
// Attention:
@@ -145,10 +134,7 @@ void SAL_CALL ProgressMonitor::acquire() throw()
BaseControl::acquire();
}
-//
// XInterface
-//
-
void SAL_CALL ProgressMonitor::release() throw()
{
// Attention:
@@ -158,10 +144,7 @@ void SAL_CALL ProgressMonitor::release() throw()
BaseControl::release();
}
-//
// XTypeProvider
-//
-
Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException )
{
// Optimize this method !
@@ -191,10 +174,7 @@ Sequence< Type > SAL_CALL ProgressMonitor::getTypes()
throw( RuntimeException )
return pTypeCollection->getTypes();
}
-//
// XAggregation
-//
-
Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw(
RuntimeException )
{
// Ask for my own supported interfaces ...
@@ -216,10 +196,7 @@ Any SAL_CALL ProgressMonitor::queryAggregation( const
Type& aType ) throw( Runti
return aReturn ;
}
-//
// XProgressMonitor
-//
-
void SAL_CALL ProgressMonitor::addText(
const OUString& rTopic,
const OUString& rText,
@@ -265,10 +242,7 @@ void SAL_CALL ProgressMonitor::addText(
impl_recalcLayout () ;
}
-//
// XProgressMonitor
-//___
[Libreoffice-commits] core.git: jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 237d2c923b77479dbdf07db7bd926c45b01b8fc8
Author: Stephan Bergmann
Date: Tue Feb 11 18:36:42 2014 +0100
Don't set JAVA_HOME on Mac OS X
...for one, it doesn't appear necessary there ("needed for awt"), and for
another setting it according to Oracle's JRE 7 would prevent a subsequent
visit to the Advanced preferences pane from listing Apple's JRE 6, as
launching
that java and reading its system properties would be fooled by the
JAVA_HOME and
report the Oracle system properties instead.
Change-Id: I02d82de6113b44b3cae3fb55cd83177fe852d769
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index a7ee90a..0069aec 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -595,7 +595,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
return JFW_PLUGIN_E_VM_CREATION_FAILED;
}
-#ifdef UNX
+#if defined UNX && !defined MACOSX
//Setting the JAVA_HOME is needed for awt
OUString javaHome("JAVA_HOME=");
OUString sPathLocation;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 chtfn changed: What|Removed |Added Depends on||52226 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 chtfn changed: What|Removed |Added Depends on|52226 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/chart2export.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b4668f2c48db7fc6df2e7914f683b26f419cd9ae Author: Markus Mohrhard Date: Wed Feb 12 08:08:07 2014 +0100 disable the test diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 1cd52be..e6dceb8 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -61,7 +61,7 @@ public: CPPUNIT_TEST(testUpDownBars); CPPUNIT_TEST(testDoughnutChart); CPPUNIT_TEST(testDisplayUnits); -CPPUNIT_TEST(testFdo74115WallGradientFill); +// CPPUNIT_TEST(testFdo74115WallGradientFill); CPPUNIT_TEST(testFdo74115WallBitmapFill); CPPUNIT_TEST(testBarChartRotation); CPPUNIT_TEST_SUITE_END(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - jvmfwk/plugins sax/qa sw/source
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |7 +++
sax/qa/cppunit/test_converter.cxx |4 ++--
sw/source/core/unocore/unostyle.cxx | 18 --
3 files changed, 9 insertions(+), 20 deletions(-)
New commits:
commit ba826a22c63b5045d93a91f13c2ba856bdf77a64
Author: Stephan Bergmann
Date: Tue Feb 11 16:45:52 2014 +0100
Simplify string handling
Change-Id: I1b79bfd7e7e92fc8f4937e6b9ae9ec9468839ea6
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 481847e..a7ee90a 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -646,7 +646,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
options[n].optionString= (char *) "abort";
options[n].extraInfo= (void* )(sal_IntPtr)abort_handler;
++n;
-OString sClassPathProp("-Djava.class.path=");
OString sClassPathOption;
for (int i = 0; i < cOptions; i++)
{
@@ -654,12 +653,12 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
// Until java 1.5 we need to put a plugin.jar or javaplugin.jar (<1.4.2)
// in the class path in order to have applet support.
OString sClassPath = arOptions[i].optionString;
-if (sClassPath.match(sClassPathProp, 0))
+if (sClassPath.startsWith("-Djava.class.path="))
{
-char sep[] = {SAL_PATHSEPARATOR, 0};
OString sAddPath = getPluginJarPath(pInfo->sVendor,
pInfo->sLocation,pInfo->sVersion);
if (!sAddPath.isEmpty())
-sClassPathOption = sClassPath + OString(sep) + sAddPath;
+sClassPathOption = sClassPath + OString(SAL_PATHSEPARATOR)
++ sAddPath;
else
sClassPathOption = sClassPath;
options[n].optionString = (char *) sClassPathOption.getStr();
commit 972d71dafda82f227149cb2e4fc6eb3a84886d89
Author: Stephan Bergmann
Date: Tue Feb 11 17:31:53 2014 +0100
At least assert here
...or is that assumption incorrect and GetOldPageDesc should rather return a
pointer that may be null?
Change-Id: I256b9085d5143c3cf2f8d3146d109c3c99edffc2
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index e46a2cc..cdec84e 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -75,6 +75,7 @@
#include "ccoll.hxx"
#include "unocore.hrc"
+#include
#include
#define STYLE_FAMILY_COUNT 5// we have 5 style families
@@ -1638,6 +1639,7 @@ const SwPageDesc& SwStyleBase_Impl::GetOldPageDesc()
}
}
}
+assert(pOldPageDesc != 0);
return *pOldPageDesc;
}
commit 151f3d665581d887cda1e36b817afb124c5c789e
Author: Stephan Bergmann
Date: Tue Feb 11 17:28:43 2014 +0100
Do not reference a dangling OUString
Change-Id: I0908d1300d0d1acb515345ccbdf6cdc2bf44d6a5
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index d92b6aa..e46a2cc 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1587,7 +1587,7 @@ struct SwStyleBase_Impl
rtl::Reference< SwDocStyleSheet > mxNewBase;
SfxItemSet* pItemSet;
-const OUString& rStyleName;
+OUString rStyleName;
SwStyleBase_Impl(SwDoc& rSwDoc, const OUString& rName) :
rDoc(rSwDoc),
commit 7fb6ae28ae7bebd67c2b9bf2cf517f1f7bb2777e
Author: Stephan Bergmann
Date: Tue Feb 11 16:31:47 2014 +0100
nPDescPos is never read
...since b48f4e99e1d2935f84bc2fac1e6670dd83939673 "#86296# use page
descriptor
only if necessary", and this nicely removes the odd
for(i = 0; i < nPDescCount + 1; i++)
loop that read past the end of the maPageDescs vector.
Change-Id: I9b0f24231774eef7231eff4b053fd56c020c6e69
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index b483d61..d92b6aa 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1588,14 +1588,12 @@ struct SwStyleBase_Impl
SfxItemSet* pItemSet;
const OUString& rStyleName;
-sal_uInt16 nPDescPos;
SwStyleBase_Impl(SwDoc& rSwDoc, const OUString& rName) :
rDoc(rSwDoc),
pOldPageDesc(0),
pItemSet(0),
-rStyleName(rName),
-nPDescPos(0x)
+rStyleName(rName)
{}
~SwStyleBase_Impl(){ delete pItemSet; }
@@ -1624,7 +1622,6 @@ const SwPageDesc& SwStyleBase_Impl::GetOldPageDesc()
if(rDesc.GetName() == rStyleName)
{
pOldPageDesc = & rDesc;
-nPDescPos = i;
break;
}
}
@@ -1639,15 +1636,6 @@ const SwPageDesc& SwStyleBase_Impl::GetOldPageDesc()
break;
[Libreoffice-commits] core.git: 16 commits - editeng/source include/editeng include/svx sc/inc sc/source sd/source starmath/source svx/source sw/source
editeng/source/uno/unoedprx.cxx|2
editeng/source/uno/unoedsrc.cxx|2
include/editeng/unoedprx.hxx |6 -
include/editeng/unoedsrc.hxx |2
include/svx/unopool.hxx|2
include/svx/unoshtxt.hxx |4 -
sc/inc/drdefuno.hxx|2
sc/inc/editsrc.hxx |4 -
sc/inc/editutil.hxx| 34 +--
sc/inc/filtopt.hxx |4 -
sc/inc/filtuno.hxx |5 -
sc/inc/fmtuno.hxx |6 -
sc/inc/funcuno.hxx |6 -
sc/inc/global.hxx | 18 ++---
sc/inc/hints.hxx | 10 +--
sc/source/core/data/global.cxx | 16 ++---
sc/source/core/data/global2.cxx|4 -
sc/source/core/data/stlpool.cxx|2
sc/source/core/tool/editutil.cxx | 40 ++---
sc/source/core/tool/hints.cxx |2
sc/source/filter/excel/xlroot.cxx |2
sc/source/ui/Accessibility/AccessibleText.cxx |2
sc/source/ui/pagedlg/tphfedit.cxx |2
sc/source/ui/unoobj/drdefuno.cxx |2
sc/source/ui/unoobj/editsrc.cxx|6 -
sc/source/ui/unoobj/filtuno.cxx|2
sc/source/ui/unoobj/fmtuno.cxx |2
sc/source/ui/unoobj/funcuno.cxx|2
sc/source/ui/unoobj/textuno.cxx|4 -
sc/source/ui/view/gridwin4.cxx |2
sc/source/ui/view/printfun.cxx |2
sc/source/ui/view/viewdata.cxx |2
sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx |2
sd/source/ui/inc/AccessibleOutlineEditSource.hxx |2
starmath/source/accessibility.cxx |2
starmath/source/accessibility.hxx |4 -
svx/source/accessibility/AccessibleEmptyEditSource.cxx |6 -
svx/source/accessibility/AccessibleEmptyEditSource.hxx |2
svx/source/unodraw/unopool.cxx | 12 +--
svx/source/unodraw/unoshtxt.cxx|2
sw/source/ui/docvw/SidebarTxtControlAcc.cxx|4 -
sw/source/ui/uno/unodefaults.cxx |2
sw/source/ui/uno/unodefaults.hxx |2
43 files changed, 120 insertions(+), 121 deletions(-)
New commits:
commit e29c77479d7cffb6d2b5a4b68f5bc0ae93855ff3
Author: Noel Grandin
Date: Tue Feb 11 16:30:44 2014 +0200
sal_Bool->bool
Change-Id: Ibd272f99af356d3dd16feeca2354dc502c685218
diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index af45f86..79e6d44 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -27,8 +27,8 @@
class ScPaintHint : public SfxHint
{
ScRange aRange;
-sal_uInt16 nParts;
-sal_BoolbPrint; // flag indicating whether print/preview if
affected
+sal_uInt16 nParts;
+boolbPrint; // flag indicating whether print/preview if
affected
ScPaintHint(); // disabled
@@ -37,7 +37,7 @@ public:
ScPaintHint( const ScRange& rRng, sal_uInt16 nPaint =
PAINT_ALL );
~ScPaintHint();
-voidSetPrintFlag(sal_Bool bSet) { bPrint = bSet; }
+voidSetPrintFlag(bool bSet) { bPrint = bSet; }
const ScRange& GetRange() const{ return aRange; }
SCCOL GetStartCol() const { return aRange.aStart.Col(); }
@@ -46,8 +46,8 @@ public:
SCCOL GetEndCol() const { return aRange.aEnd.Col(); }
SCROW GetEndRow() const { return aRange.aEnd.Row(); }
SCTAB GetEndTab() const { return aRange.aEnd.Tab(); }
-sal_uInt16 GetParts() const{ return nParts; }
-sal_BoolGetPrintFlag() const{ return bPrint; }
+sal_uInt16 GetParts() const{ return nParts; }
+boolGetPrintFlag() const{ return bPrint; }
};
class ScUpdateRefHint : public SfxHint
diff --git a/sc/source/core/tool/hints.cxx b/sc/source/core/tool/hints.cxx
index 45c9f75..28c8873 100644
--- a/sc/source/core/tool/hints.cxx
+++ b/sc/source/core/tool/hints.cxx
@@ -32,7 +32,7 @@ TYPEINIT1(ScDataPilotModifiedHint, SfxHint);
ScPaintHint::ScPaintHint( const ScRange& rRng, sal_uInt16 nPa
[Libreoffice-commits] core.git: 22 commits - dbaccess/source filter/source forms/source framework/source idl/source sc/source sfx2/source svgio/source svtools/source svx/source sw/source xmloff/source
dbaccess/source/ui/control/FieldDescControl.cxx | 20 +-
dbaccess/source/ui/inc/FieldDescControl.hxx |6 +--
dbaccess/source/ui/misc/WTypeSelect.cxx |2 -
filter/source/svg/svgexport.cxx | 18 -
forms/source/component/formcontrolfont.cxx|2 +
framework/source/uiconfiguration/windowstateconfiguration.cxx |1
idl/source/objects/types.cxx |1
sc/source/ui/vba/vbarange.cxx |5 ++
sfx2/source/appl/appcfg.cxx |1
sfx2/source/view/viewfrm.cxx |2 -
svgio/source/svgreader/svgusenode.cxx |1
svtools/source/config/optionsdrawinglayer.cxx |1
svx/source/fmcomp/gridcell.cxx|1
svx/source/unodraw/unoshape.cxx |1
sw/source/filter/xml/xmlimpit.cxx |2 +
sw/source/ui/uno/SwXDocumentSettings.cxx |1
xmloff/source/draw/ximpshap.cxx |2 +
xmloff/source/style/cdouthdl.cxx |1
xmloff/source/transform/OOo2Oasis.cxx |2 +
19 files changed, 46 insertions(+), 24 deletions(-)
New commits:
commit 5d38824834b68e32062984f30acac7a741eda535
Author: Noel Grandin
Date: Wed Feb 12 08:58:15 2014 +0200
cid#736038 missing break in switch
Change-Id: Icca673a955441da87921e530c4bfe6c8f0e79723
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index f7c67ea..3aa17b3 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -231,7 +231,7 @@ public:
{
switch( eDateFormat )
{
-case SVXDATEFORMAT_STDSMALL: ;
+case SVXDATEFORMAT_STDSMALL:
case SVXDATEFORMAT_A: // 13.02.96
sDateFormat = "";
break;
commit 78ec17eb6bbaa5518ce2bc0a08a6d7a6f27cc8b3
Author: Noel Grandin
Date: Tue Feb 11 15:44:43 2014 +0200
cid#705350 missing break in switch
Change-Id: I8f01d7b3406eed629b08082c5a1c9e1466d954f1
diff --git a/xmloff/source/transform/OOo2Oasis.cxx
b/xmloff/source/transform/OOo2Oasis.cxx
index 1b2661e..5e3f849 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1749,6 +1749,7 @@ XMLTransformerActions
*OOo2OasisTransformer::GetUserDefinedActions(
case OOO_DATAPILOT_LEVEL_ACTIONS:
m_aActions[OOO_DATAPILOT_LEVEL_ACTIONS] =
new XMLTransformerActions( aDataPilotLevelActionTable
);
+break;
case OOO_SOURCE_SERVICE_ACTIONS:
m_aActions[OOO_SOURCE_SERVICE_ACTIONS] =
new XMLTransformerActions( aSourceServiceActionTable );
commit 69b31ea3d88f831fb771f4f160a7e227dd373478
Author: Noel Grandin
Date: Tue Feb 11 15:40:35 2014 +0200
cid#705349 missing break in switch
Change-Id: I1e76cb8878968adffb1c8bebfc90786025a2b7c3
diff --git a/xmloff/source/transform/OOo2Oasis.cxx
b/xmloff/source/transform/OOo2Oasis.cxx
index e956b4d..1b2661e 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1745,6 +1745,7 @@ XMLTransformerActions
*OOo2OasisTransformer::GetUserDefinedActions(
case OOO_DATAPILOT_MEMBER_ACTIONS:
m_aActions[OOO_DATAPILOT_MEMBER_ACTIONS] =
new XMLTransformerActions( aDataPilotMemberActionTable
);
+break;
case OOO_DATAPILOT_LEVEL_ACTIONS:
m_aActions[OOO_DATAPILOT_LEVEL_ACTIONS] =
new XMLTransformerActions( aDataPilotLevelActionTable
);
commit a9cb2af8c29accba8dc1573859965ccca3e2edd7
Author: Noel Grandin
Date: Tue Feb 11 15:34:51 2014 +0200
cid#705344 missing break in switch
Change-Id: I734d4ed0dbb7b1cdf7640b76d88ea1ff2d19da4c
diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx
index d559eb8..9b4dd7d 100644
--- a/xmloff/source/style/cdouthdl.cxx
+++ b/xmloff/source/style/cdouthdl.cxx
@@ -230,6 +230,7 @@ bool XMLCrossedOutWidthPropHdl::importXML( const OUString&
rStrImpValue, uno::An
eNewStrikeout = eStrikeout;
break;
}
+break;
default:
OSL_ENSURE( bRet, "unexpected line type value" );
break;
commit 746028f5c56eb80ad6b9474e5927a62b0c4855a6
Author: Noel Grandin
Date: Tue Feb 11 15:32:35 2014 +0200
cid#705343 missing break in switch
Change-Id: I0fe11a71223c15937917a1a06a9078e856f0f67f
diff --git a/xmloff/source/draw/
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/column2.cxx | 10 --
1 file changed, 10 deletions(-)
New commits:
commit 4e432a178f231bb5147c75dff36687407bb9af43
Author: Tor Lillqvist
Date: Wed Feb 12 08:54:45 2014 +0200
WaE: unused function 'hasNonEmpty'
Change-Id: I8a806caf50df76687a339f583ce57d244553240d
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 2c3e58a..6390979 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2558,16 +2558,6 @@ struct NonNullStringFinder : std::unary_function
bool operator() (const rtl_uString* p) const { return p != NULL; }
};
-bool hasNonEmpty( const sc::FormulaGroupContext::NumArrayType& rArray, SCROW
nRow1, SCROW nRow2 )
-{
-// The caller has to make sure the array is at least nRow2+1 long.
-sc::FormulaGroupContext::NumArrayType::const_iterator it = rArray.begin();
-std::advance(it, nRow1);
-sc::FormulaGroupContext::NumArrayType::const_iterator itEnd = it;
-std::advance(itEnd, nRow2-nRow1+1);
-return std::find_if(it, itEnd, FiniteValueFinder()) != itEnd;
-}
-
bool hasNonEmpty( const sc::FormulaGroupContext::StrArrayType& rArray, SCROW
nRow1, SCROW nRow2 )
{
// The caller has to make sure the array is at least nRow2+1 long.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2014-02-12
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#63154 Remove unused solar.h ref in vcl, basctl, desktop.. in https://gerrit.libreoffice.org/8001 from Alexandre Vicenzi about module UnoControls, basctl, desktop, include, vcl + fdo#74111 3D Rotation is wrong after Round trip for pie chart in https://gerrit.libreoffice.org/7718 from Priyanka Gaikwad about module chart2, oox + Export MailMerge cancel functionality via UNO. in https://gerrit.libreoffice.org/7190 from Jan-Marek Glogowski about module offapi, sw + FDO#74774 : issue with number of child nodes of tag CubicBezierTo. in https://gerrit.libreoffice.org/7990 from Umesh Kadam about module oox, sw End of freshness + Removes bogus UNO command AcceptChange and RejectChange in https://gerrit.libreoffice.org/8000 from Rodolfo Ribeiro Gomes about module officecfg + fdo#47677 Add Changes Review toolbar for Writer in https://gerrit.libreoffice.org/7999 from Rodolfo Ribeiro Gomes about module officecfg, sw + Seperate initialization of OutputDevice instance in https://gerrit.libreoffice.org/ from Chris Sherlock about module include, vcl + fdo#74137: Fix for courruption of Pie chart after roundtrip. in https://gerrit.libreoffice.org/7910 from Rohit Deshmukh about module chart2, oox + Invalidate SID_TABLE_VERT_ in https://gerrit.libreoffice.org/7993 from Maxim Monastirsky about module sc + Add some missing commands in https://gerrit.libreoffice.org/7992 from Maxim Monastirsky about module officecfg + sc: refactor ScDrawTextObjectBar::ExecuteAttr in https://gerrit.libreoffice.org/7991 from Maxim Monastirsky about module sc * Merged changes on master for project core changed in the last 25 hours: + fdo#72520 : Preserving external data path in chart import. in https://gerrit.libreoffice.org/7214 from Sushil Shinde + fdo#74111 3D Rotation is wrong after Round trip for bar chart in https://gerrit.libreoffice.org/7806 from Priyanka Gaikwad + fdo#74115 Fix for DOCX BitmapFill for Chart Wall in https://gerrit.libreoffice.org/7792 from Vinaya Mandke + fdo#74115 Fix for DOCX GradientFill for Chart Wall in https://gerrit.libreoffice.org/7739 from Vinaya Mandke + fdo#74112 Write Chart Displayunits information back to XML. in https://gerrit.libreoffice.org/7722 from Sushil Shinde + fdo#74112 Added properties to store chart display unit information in imp in https://gerrit.libreoffice.org/7720 from Sushil Shinde + fdo#74112 Preserve Chart displayunits properties during ODF import/export in https://gerrit.libreoffice.org/7721 from Sushil Shinde + Add XML dumping of the new 'SwExtraRedlineTbl' in https://gerrit.libreoffice.org/7824 from Adam CloudOn + Add support for 'Table Row Redlines' in SW core in https://gerrit.libreoffice.org/7821 from Adam CloudOn + Nit-pick: Added a 'default' clause for a switch-case in https://gerrit.libreoffice.org/7819 from Adam CloudOn + Refactor some code for handling redline in DOCX importer in https://gerrit.libreoffice.org/7807 from Adam CloudOn + Refactor the code for converting 'Date' string to 'DateTime' in https://gerrit.libreoffice.org/7817 from Adam CloudOn + Add 'Track Changes Handler' for 'Extra' redlines in https://gerrit.libreoffice.org/7802 from Adam CloudOn + Add some property IDs in the DOCX importer (for future table redline patc in https://gerrit.libreoffice.org/7818 from Adam CloudOn + Copy mail merge source instead of loading in https://gerrit.libreoffice.org/7433 from Jan-Marek Glogowski + Add tokens for 'table row' redlines (future patch) in https://gerrit.libreoffice.org/7801 from Adam CloudOn + Add derived class 'SwTableRowRedline' stub in https://gerrit.libreoffice.org/7466 from Adam CloudOn + New redline object and table for non-ranged redlines called 'SwExtraRedli in https://gerrit.libreoffice.org/7464 from Adam CloudOn + fdo#72468 avoid out of bounds array access in https://gerrit.libreoffice.org/7775 from Arnaud Versini * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + fdo#51525 Fix duplicate "Paste Special" entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#50763: handle inlined base64 images in https://gerrit.libreoffice.org/7773 from Christina Roßmanith + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + fdo#69407: On transparent frames, shadows are painted in foreground. in https://gerrit.libreoffice.org/7070 from Mohamed-Ali BEN MANSOUR + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + upgrade liborcus in
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/drawingml/chart/chartspacefragment.hxx |2 ++
include/oox/drawingml/chart/chartspacemodel.hxx|3 ++-
oox/source/drawingml/chart/chartspaceconverter.cxx |7 +++
oox/source/drawingml/chart/chartspacefragment.cxx |6 +-
4 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit 5505cf4f1c7b27662b0e8c0a6db01fd8c52243c3
Author: sushil_shinde
Date: Fri Dec 27 14:36:10 2013 +0530
fdo#72520 : Preserving external data path in chart import.
- Preserved external data path for chart in newly added
property for external data.
Change-Id: I3c49093c9e71cd126c097500b3951a345e81039e
Reviewed-on: https://gerrit.libreoffice.org/7214
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/include/oox/drawingml/chart/chartspacefragment.hxx
b/include/oox/drawingml/chart/chartspacefragment.hxx
index 653bbf7..6e927ba 100644
--- a/include/oox/drawingml/chart/chartspacefragment.hxx
+++ b/include/oox/drawingml/chart/chartspacefragment.hxx
@@ -42,6 +42,8 @@ public:
virtual ~ChartSpaceFragment();
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32
nElement, const AttributeList& rAttribs );
+
+::oox::core::XmlFilterBase& mpFilterBase;
};
//
diff --git a/include/oox/drawingml/chart/chartspacemodel.hxx
b/include/oox/drawingml/chart/chartspacemodel.hxx
index f1a27d8..07f119e 100644
--- a/include/oox/drawingml/chart/chartspacemodel.hxx
+++ b/include/oox/drawingml/chart/chartspacemodel.hxx
@@ -49,7 +49,8 @@ struct ChartSpaceModel
View3DRef mxView3D; /// 3D settings.
TitleRefmxTitle;/// Chart main title.
LegendRef mxLegend; /// Chart legend.
-OUString maDrawingPath; /// Path to drawing fragment with
embedded shapes.
+OUStringmaDrawingPath; /// Path to drawing fragment with
embedded shapes.
+OUStringmaSheetPath;/// Path to embedded charts.
sal_Int32 mnDispBlanksAs; /// Mode how to display blank
values.
sal_Int32 mnStyle;/// Index to default formatting.
boolmbAutoTitleDel; /// True = automatic title deleted
manually.
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx
b/oox/source/drawingml/chart/chartspaceconverter.cxx
index db04215..d6b09a4 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -212,6 +212,13 @@ void ChartSpaceConverter::convertFromModel( const
Reference< XShapes >& rxExtern
aProps.setProperty( PROP_DisableDataTableDialog , true );
aProps.setProperty( PROP_DisableComplexChartTypes , true );
}
+
+if(!mrModel.maSheetPath.isEmpty() )
+{
+Reference< ::com::sun::star::chart::XChartDocument > xChartDoc(
getChartDocument(), UNO_QUERY );
+PropertySet aProps( xChartDoc->getDiagram() );
+aProps.setProperty( PROP_ExternalData ,
uno::makeAny(mrModel.maSheetPath) );
+}
}
//
diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx
b/oox/source/drawingml/chart/chartspacefragment.cxx
index 2e717a8..03389f0 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -36,7 +36,8 @@ using namespace ::oox::core;
//
ChartSpaceFragment::ChartSpaceFragment( XmlFilterBase& rFilter, const
OUString& rFragmentPath, ChartSpaceModel& rModel ) :
-FragmentBase< ChartSpaceModel >( rFilter, rFragmentPath, rModel )
+FragmentBase< ChartSpaceModel >( rFilter, rFragmentPath, rModel ),
+mpFilterBase(rFilter)
{
}
@@ -74,6 +75,9 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext(
sal_Int32 nElement, const
case C_TOKEN( pivotSource ):
mrModel.mbPivotChart = true;
return 0;
+case C_TOKEN (externalData):
+mrModel.maSheetPath =
getFragmentPathFromRelId(rAttribs.getString(R_TOKEN(id),OUString()));
+return 0;
}
break;
___
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/drawingml.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1779d2a3dde60cf705702fcb132bba46aa38fc5b
Author: Markus Mohrhard
Date: Wed Feb 12 03:34:03 2014 +0100
nasty merge error
Change-Id: I5afaf03c5aee417ea40cea65b2ac51dde7c35918
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 42fec3f..050b931 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -349,6 +349,7 @@ void DrawingML::WriteGradientFill( Reference< XPropertySet
> rXPropSet )
mpFS->endElementNS( XML_a, XML_gradFill );
}
}
+
void DrawingML::WriteGrabBagGradientFill( Sequence< PropertyValue >
aGradientStops, awt::Gradient rGradient )
{
// write back the original gradient
@@ -440,7 +441,6 @@ void DrawingML::WriteGradientFill( awt::Gradient rGradient )
FSEND );
break;
}
-mpFS->endElementNS( XML_a, XML_gradFill );
}
void DrawingML::WriteLineArrow( Reference< XPropertySet > rXPropSet, sal_Bool
bLineStart )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/data/docx/fdo74115_WallBitmapFill.docx |binary 1 file changed New commits: commit 18837a11fff1a93dc489c5427339bcfec4bed6e2 Author: Markus Mohrhard Date: Wed Feb 12 03:14:07 2014 +0100 a 800 kB file is maybe not the best idea for a test case Change-Id: Ie59d6e019d140f87a8f5ebb922524a5a2d5218e6 diff --git a/chart2/qa/extras/data/docx/fdo74115_WallBitmapFill.docx b/chart2/qa/extras/data/docx/fdo74115_WallBitmapFill.docx index 0c842fd..15f42b0 100644 Binary files a/chart2/qa/extras/data/docx/fdo74115_WallBitmapFill.docx and b/chart2/qa/extras/data/docx/fdo74115_WallBitmapFill.docx differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa oox/source
chart2/qa/extras/chart2export.cxx| 12
chart2/qa/extras/data/docx/barChartRotation.docx |binary
oox/source/drawingml/chart/plotareaconverter.cxx |2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit c753c0b937ee4a86ac6a5f2617ffb59f65e7e713
Author: PriyankaGaikwad
Date: Mon Feb 3 17:30:49 2014 +0530
fdo#74111 3D Rotation is wrong after Round trip for bar chart
3D Rotation is lost after Round trip for bar chart.
XML Difference:
Original:
Round Trip:
Implementation:
The RightAngledAxes should set first then the RotationVertical and
RotationHorizontal
because the RightAngledAxes is needed while setting Rotation.
Conflicts:
chart2/qa/extras/chart2export.cxx
Change-Id: I64f3b6e56f8515bf6c3d935c59dfaf1d440dba31
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 77140840..1cd52be 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -45,6 +45,7 @@ public:
void testDisplayUnits();
void testFdo74115WallGradientFill();
void testFdo74115WallBitmapFill();
+void testBarChartRotation();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(test);
@@ -62,6 +63,7 @@ public:
CPPUNIT_TEST(testDisplayUnits);
CPPUNIT_TEST(testFdo74115WallGradientFill);
CPPUNIT_TEST(testFdo74115WallBitmapFill);
+CPPUNIT_TEST(testBarChartRotation);
CPPUNIT_TEST_SUITE_END();
protected:
@@ -566,6 +568,16 @@ void Chart2ExportTest::testFdo74115WallBitmapFill()
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:blipFill");
}
+void Chart2ExportTest::testBarChartRotation()
+{
+load ("/chart2/qa/extras/data/docx/", "barChartRotation.docx");
+xmlDocPtr pXmlDoc = parseExport("word/charts/chart","Office Open XML
Text");
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX", "val", "30");
+assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotY", "val", "50");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/docx/barChartRotation.docx
b/chart2/qa/extras/data/docx/barChartRotation.docx
new file mode 100644
index 000..bf4be47
Binary files /dev/null and b/chart2/qa/extras/data/docx/barChartRotation.docx
differ
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx
b/oox/source/drawingml/chart/plotareaconverter.cxx
index c069078..8fcb625 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -255,10 +255,10 @@ void View3DConverter::convertFromModel( const Reference<
XDiagram >& rxDiagram,
cssd::ProjectionMode eProjMode = bParallel ? cssd::ProjectionMode_PARALLEL
: cssd::ProjectionMode_PERSPECTIVE;
// set rotation properties
+aPropSet.setProperty( PROP_RightAngledAxes, bRightAngled );
aPropSet.setProperty( PROP_RotationVertical, nRotationY );
aPropSet.setProperty( PROP_RotationHorizontal, nRotationX );
aPropSet.setProperty( PROP_Perspective, nPerspective );
-aPropSet.setProperty( PROP_RightAngledAxes, bRightAngled );
aPropSet.setProperty( PROP_D3DScenePerspective, eProjMode );
// set light settings
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa include/oox oox/source
chart2/qa/extras/chart2export.cxx | 10
chart2/qa/extras/data/docx/fdo74115_WallBitmapFill.docx |binary
include/oox/export/chartexport.hxx |1
include/oox/export/drawingml.hxx| 16 +--
oox/source/export/chartexport.cxx | 31 ++
oox/source/export/drawingml.cxx | 34 ++--
oox/source/export/shapes.cxx|2
7 files changed, 77 insertions(+), 17 deletions(-)
New commits:
commit ffb1053b287fddd2c96757e5c6825381afc43fa1
Author: Vinaya Mandke
Date: Mon Feb 3 11:53:02 2014 +0530
fdo#74115 Fix for DOCX BitmapFill for Chart Wall
Fixed import and export for chart wall Bitmap Fill in DOCX
Added UT for the same.
Conflicts:
oox/source/export/chartexport.cxx
Change-Id: Id066b0e4c2007fcdfdbbfa67b40307463bf0cfe7
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index d51bd1c..77140840 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -44,6 +44,7 @@ public:
void testDoughnutChart();
void testDisplayUnits();
void testFdo74115WallGradientFill();
+void testFdo74115WallBitmapFill();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(test);
@@ -60,6 +61,7 @@ public:
CPPUNIT_TEST(testDoughnutChart);
CPPUNIT_TEST(testDisplayUnits);
CPPUNIT_TEST(testFdo74115WallGradientFill);
+CPPUNIT_TEST(testFdo74115WallBitmapFill);
CPPUNIT_TEST_SUITE_END();
protected:
@@ -556,6 +558,14 @@ void Chart2ExportTest::testFdo74115WallGradientFill()
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill");
}
+void Chart2ExportTest::testFdo74115WallBitmapFill()
+{
+load("/chart2/qa/extras/data/docx/", "fdo74115_WallBitmapFill.docx");
+xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML
Text");
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:blipFill");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/docx/fdo74115_WallBitmapFill.docx
b/chart2/qa/extras/data/docx/fdo74115_WallBitmapFill.docx
new file mode 100644
index 000..0c842fd
Binary files /dev/null and
b/chart2/qa/extras/data/docx/fdo74115_WallBitmapFill.docx differ
diff --git a/include/oox/export/chartexport.hxx
b/include/oox/export/chartexport.hxx
index c9c13ba..04a5e20 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -123,6 +123,7 @@ private:
void exportPlotAreaShapeProps( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > xPropSet );
void exportFill( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > xPropSet );
void exportGradientFill( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > xPropSet );
+void exportBitmapFill( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > xPropSet );
void exportDataTable( );
void exportAreaChart( com::sun::star::uno::Reference<
com::sun::star::chart2::XChartType > xChartType );
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 8b963f7..36d94a6 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -101,7 +101,9 @@ protected:
OUString aName, ::com::sun::star::beans::PropertyState&
eState );
const char* GetFieldType( ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > rRun, sal_Bool& bIsField );
-OUString WriteImage( const OUString& rURL );
+
+/// If bRelPathToMedia is true add "../" to image folder path while adding
the image relationship
+OUString WriteImage( const OUString& rURL, bool bRelPathToMedia = false);
void WriteStyleProperties( sal_Int32 nTokenId,
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
aProperties );
const char* GetComponentDir();
@@ -117,7 +119,8 @@ public:
::oox::core::XmlFilterBase* GetFB() { return mpFB; }
DocumentType GetDocumentType() { return meDocumentType; }
-OUString WriteImage( const Graphic &rGraphic );
+/// If bRelPathToMedia is true add "../" to image folder path while adding
the image relationship
+OUString WriteImage( const Graphic &rGraphic , bool bRelPathToMedia =
false);
void WriteColor( sal_uInt32 nColor, sal_Int32 nAlpha = MAX_PERCENT );
void WriteColor( OUString sColorSchemeName,
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
aTransformations );
@@ -132,14 +135,19 @@ public:
void WriteGradientFill( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteGradientFill( ::com::sun::star::awt::Gradient rGradient );
void Wri
[Libreoffice-commits] core.git: 2 commits - chart2/qa include/oox oox/source
chart2/qa/extras/chart2export.cxx | 13 +
chart2/qa/extras/data/docx/fdo74115_WallGradientFill.docx |binary
include/oox/export/chartexport.hxx|3
include/oox/export/drawingml.hxx |2
oox/source/drawingml/chart/objectformatter.cxx|2
oox/source/export/chartexport.cxx | 62
oox/source/export/drawingml.cxx | 175 +++---
7 files changed, 171 insertions(+), 86 deletions(-)
New commits:
commit f38a223d6d455b07a4fdbfe842b2b367306544d5
Author: Markus Mohrhard
Date: Wed Feb 12 02:39:15 2014 +0100
small stylistic changes
Change-Id: I31cbdc8e09474252205edb837bfd1a8a7299b52b
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 4d8d931..939e5a4 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1163,10 +1163,11 @@ void ChartExport::exportFill( Reference< XPropertySet >
xPropSet )
xPropSet->getPropertyValue( "FillStyle" ) >>= aFillStyle;
switch( aFillStyle )
{
-case FillStyle_GRADIENT :
-exportGradientFill( xPropSet );
-default:
-WriteFill( xPropSet );
+case FillStyle_GRADIENT :
+exportGradientFill( xPropSet );
+break;
+default:
+WriteFill( xPropSet );
}
}
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 1584356..ee3f9b1 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -338,6 +338,7 @@ void DrawingML::WriteGradientFill( Reference< XPropertySet
> rXPropSet )
aGrabBag[i].Value >>= aOriginalGradient;
}
+mpFS->startElementNS( XML_a, XML_gradFill, FSEND );
// check if an ooxml gradient had been imported and if the user has
modified it
if( aGradientStops.hasElements() && EqualGradients( aOriginalGradient,
aGradient ) )
{
@@ -345,11 +346,11 @@ void DrawingML::WriteGradientFill( Reference<
XPropertySet > rXPropSet )
}
else
WriteGradientFill(aGradient);
+mpFS->endElementNS( XML_a, XML_gradFill );
}
}
void DrawingML::WriteGrabBagGradientFill( Sequence< PropertyValue >
aGradientStops, awt::Gradient rGradient )
{
-mpFS->startElementNS( XML_a, XML_gradFill, FSEND );
// write back the original gradient
mpFS->startElementNS( XML_a, XML_gsLst, FSEND );
@@ -396,50 +397,48 @@ void DrawingML::WriteGrabBagGradientFill( Sequence<
PropertyValue > aGradientSto
mpFS->singleElementNS( XML_a, XML_lin,
XML_ang, I32S( ( ( ( 3600 - rGradient.Angle + 900 )
* 6000 ) % 2160 ) ),
FSEND );
-mpFS->endElementNS( XML_a, XML_gradFill );
}
void DrawingML::WriteGradientFill( awt::Gradient rGradient )
{
-mpFS->startElementNS( XML_a, XML_gradFill, FSEND );
switch( rGradient.Style ) {
-default:
-case GradientStyle_LINEAR:
-mpFS->startElementNS( XML_a, XML_gsLst, FSEND );
-WriteGradientStop( 0, ColorWithIntensity( rGradient.StartColor,
rGradient.StartIntensity ) );
-WriteGradientStop( 100, ColorWithIntensity( rGradient.EndColor,
rGradient.EndIntensity ) );
-mpFS->endElementNS( XML_a, XML_gsLst );
-mpFS->singleElementNS( XML_a, XML_lin,
-XML_ang, I32S( ( ( ( 3600 - rGradient.Angle + 900 ) * 6000 ) %
2160 ) ),
-FSEND );
-break;
+default:
+case GradientStyle_LINEAR:
+mpFS->startElementNS( XML_a, XML_gsLst, FSEND );
+WriteGradientStop( 0, ColorWithIntensity( rGradient.StartColor,
rGradient.StartIntensity ) );
+WriteGradientStop( 100, ColorWithIntensity( rGradient.EndColor,
rGradient.EndIntensity ) );
+mpFS->endElementNS( XML_a, XML_gsLst );
+mpFS->singleElementNS( XML_a, XML_lin,
+XML_ang, I32S( ( ( ( 3600 - rGradient.Angle + 900 ) * 6000
) % 2160 ) ),
+FSEND );
+break;
-case GradientStyle_AXIAL:
-mpFS->startElementNS( XML_a, XML_gsLst, FSEND );
-WriteGradientStop( 0, ColorWithIntensity( rGradient.EndColor,
rGradient.EndIntensity ) );
-WriteGradientStop( 50, ColorWithIntensity( rGradient.StartColor,
rGradient.StartIntensity ) );
-WriteGradientStop( 100, ColorWithIntensity( rGradient.EndColor,
rGradient.EndIntensity ) );
-mpFS->endElementNS( XML_a, XML_gsLst );
-mpFS->singleElementNS( XML_a, XML_lin,
-XML_ang, I32S( ( ( ( 3600 - rGradient.Angle + 900 ) * 6000 ) %
2160 ) ),
-FSEND );
-break;
+case GradientStyle_AXIAL:
+mpFS->startElementNS( XML_a, XML_gsLst, FSEND );
+WriteGradientStop( 0, ColorWithIntensity( rGradient.EndColor,
rGradient.EndIntensity ) );
+
[Libreoffice-commits] core.git: 5 commits - basic/source oox/source sc/source slideshow/source
basic/source/comp/token.cxx|6
++
oox/source/export/chartexport.cxx | 17
+++---
sc/source/filter/oox/sheetdatacontext.cxx |5 +
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 26
+-
4 files changed, 32 insertions(+), 22 deletions(-)
New commits:
commit f0d232f7b78edc3a0acff6d2beee97ff8bb2bd94
Author: Markus Mohrhard
Date: Wed Feb 12 00:39:13 2014 +0100
prevent invalid OOXML chart files
Change-Id: I2ccf988a26e5c69f4f14547cfea7cb4fb574b317
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 72afb08..ed5ea8b 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2390,7 +2390,7 @@ void ChartExport::_exportAxis(
}
sal_Bool bDisplayUnits = sal_False;
-if(GetProperty( xAxisProp, "DisplayUnits" ) )
+if( nAxisType == XML_valAx && GetProperty( xAxisProp, "DisplayUnits" ) )
{
mAny >>= bDisplayUnits;
if(bDisplayUnits)
commit a67f56f78c52161b3934d61848ab9388f75a57a1
Author: Markus Mohrhard
Date: Wed Feb 12 00:32:34 2014 +0100
until we support custUnit make sure that all files are valid
Change-Id: I759a4cc97e2a2adf71322d2aa18fdb11873a538e
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index dbbeb07..72afb08 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2396,22 +2396,23 @@ void ChartExport::_exportAxis(
if(bDisplayUnits)
{
OUString aVal;
-pFS->startElement( FSNS( XML_c, XML_dispUnits ),
-FSEND );
if(GetProperty( xAxisProp, "BuiltInUnit" ))
{
mAny >>= aVal;
if(!aVal.isEmpty())
{
+pFS->startElement( FSNS( XML_c, XML_dispUnits ),
+FSEND );
+
OString aBuiltInUnit = OUStringToOString(aVal,
RTL_TEXTENCODING_UTF8);
pFS->singleElement( FSNS( XML_c, XML_builtInUnit ),
-XML_val, aBuiltInUnit.getStr(),
-FSEND );
+XML_val, aBuiltInUnit.getStr(),
+FSEND );
+
+pFS->singleElement(FSNS( XML_c, XML_dispUnitsLbl ),FSEND);
+pFS->endElement( FSNS( XML_c, XML_dispUnits ) );
}
}
- pFS->singleElement(FSNS( XML_c, XML_dispUnitsLbl ),FSEND);
- pFS->endElement( FSNS( XML_c, XML_dispUnits ) );
-
}
}
// TODO: text properties
commit 171bde3d1e3fb5c7d3cd1fd25e6135e2f7272cb6
Author: Markus Mohrhard
Date: Tue Feb 11 21:55:41 2014 +0100
glx 1.3 is already supported in out base line
Change-Id: I4304368ebb5f40cb946290a717240143f845e0c9
diff --git
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 33b39fb..52418cb 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -217,7 +217,7 @@ protected:
bool createWindow( Window* pPWindow );
void createTexture( unsigned int* texID,
-#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+#if defined( GLX_EXT_texture_from_pixmap )
unx::GLXPixmap pixmap,
bool usePixmap,
#endif
@@ -255,7 +255,7 @@ private:
unx::Display* dpy;
int screen;
unx::Window win;
-#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+#if defined( GLX_EXT_texture_from_pixmap )
unx::GLXFBConfigfbc;
#endif
unx::XVisualInfo* vi;
@@ -295,7 +295,7 @@ private:
*/
uno::Sequence LeavingBytes;
-#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+#if defined( GLX_EXT_texture_from_pixmap )
unx::GLXPixmap LeavingPixmap;
unx::GLXPixmap EnteringPixmap;
#endif
@@ -460,7 +460,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
GLWin.screen = XScreenNumberOfScreen( xattr.screen );
unx::XVisualInfo* vi( NULL );
-#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+#if defined( GLX_EXT_texture_from_pixmap )
unx::XVisualInfo* visinfo;
unx::XVisualInfo* firstVisual( NULL );
#endif
@@ -517,7 +517,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
delete pWindow;
pWindow=NULL;
-#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+#if defined( GLX_EXT_texture_from_pixmap )
unx::GLXFBConfig* fbconfigs = NULL;
int nfbconfigs = 0, value = 0, i = 0;
#endif
@@ -530,7 +530,7 @@ bool OGLTransi
[Bug 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #5 from Mat M --- Caolan: Thanks for poitning that out. So the :border is just a kind of qualifier and this element: is legal as a pointer for help ids ? Is this the only "deformed" value we can get for ids (a colon followed by something) or something else could happen ? TY -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938 --- Comment #56 from Alexandre Vicenzi --- I tried to convert dbaccess/source/inc/apitools.hxx, but I get this: In member function ‘virtual sal_Bool dbaccess::OQuery::supportsService(const rtl::OUString&)’: ./dbaccess/source/inc/apitools.hxx:81:57: error: ‘com::sun::star::lang::XServiceInfo’ is an ambiguous base of ‘dbaccess::OQuery’ return cppu::supportsService(this, _rServiceName); Do you have any idea? In this case supportsService is a macro. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/drawingml/chart/axisconverter.hxx | 15 +++
include/oox/drawingml/chart/axismodel.hxx |2 +-
oox/source/drawingml/chart/axiscontext.cxx|2 +-
oox/source/drawingml/chart/axisconverter.cxx | 24
oox/source/drawingml/chart/axismodel.cxx |3 +--
oox/source/token/properties.txt |2 ++
6 files changed, 44 insertions(+), 4 deletions(-)
New commits:
commit 3ec8d33e46046b13abad2daf850e23f896ad05bc
Author: sushil_shinde
Date: Wed Jan 29 13:33:23 2014 +0530
fdo#74112 Added properties to store chart display unit information in
import.
- added display unit properties.
- added axis display unit converter class.
Change-Id: Iaa1f9a175b1109c8da7321a1567a04fb981568d1
Reviewed-on: https://gerrit.libreoffice.org/7720
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/include/oox/drawingml/chart/axisconverter.hxx
b/include/oox/drawingml/chart/axisconverter.hxx
index e107057..7224b97 100644
--- a/include/oox/drawingml/chart/axisconverter.hxx
+++ b/include/oox/drawingml/chart/axisconverter.hxx
@@ -33,6 +33,21 @@ namespace chart {
//
+struct AxisDispUnitsModel;
+
+class AxisDispUnitsConverter : public ConverterBase< AxisDispUnitsModel >
+{
+public:
+explicitAxisDispUnitsConverter(
+const ConverterRoot& rParent,
+AxisDispUnitsModel& rModel );
+virtual ~AxisDispUnitsConverter();
+
+/** Creates a chart2 axis and inserts it into the passed coordinate
system. */
+voidconvertFromModel(
+const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XAxis >& rxAxis);
+};
+
struct AxisModel;
class TypeGroupConverter;
diff --git a/include/oox/drawingml/chart/axismodel.hxx
b/include/oox/drawingml/chart/axismodel.hxx
index dd543d0..d29af7f 100644
--- a/include/oox/drawingml/chart/axismodel.hxx
+++ b/include/oox/drawingml/chart/axismodel.hxx
@@ -41,7 +41,7 @@ struct AxisDispUnitsModel
LayoutRef mxLayout; /// Layout/position of the axis
units label.
TextRef mxText; /// Text source of the axis units
label.
double mfCustomUnit; /// Custom unit size on value axis.
-sal_Int32 mnBuiltInUnit; /// Built-in unit on value axis.
+OUStringmnBuiltInUnit; /// Built-in unit on value axis.
explicitAxisDispUnitsModel();
~AxisDispUnitsModel();
diff --git a/oox/source/drawingml/chart/axiscontext.cxx
b/oox/source/drawingml/chart/axiscontext.cxx
index cf023f2..2160354 100644
--- a/oox/source/drawingml/chart/axiscontext.cxx
+++ b/oox/source/drawingml/chart/axiscontext.cxx
@@ -52,7 +52,7 @@ ContextHandlerRef AxisDispUnitsContext::onCreateContext(
sal_Int32 nElement, con
switch( nElement )
{
case C_TOKEN( builtInUnit ):
-mrModel.mnBuiltInUnit = rAttribs.getToken( XML_val,
XML_thousands );
+mrModel.mnBuiltInUnit = rAttribs.getString( XML_val,
"thousands" );
return 0;
case C_TOKEN( custUnit ):
mrModel.mfCustomUnit = rAttribs.getDouble( XML_val, 0.0 );
diff --git a/oox/source/drawingml/chart/axisconverter.cxx
b/oox/source/drawingml/chart/axisconverter.cxx
index 5efa7d9..23e4829 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -342,6 +342,10 @@ void AxisConverter::convertFromModel( const Reference<
XCoordinateSystem >& rxCo
TitleConverter aTitleConv( *this, *mrModel.mxTitle );
aTitleConv.convertFromModel( xTitled, "Axis Title",
OBJECTTYPE_AXISTITLE, nAxesSetIdx, nAxisIdx );
}
+
+// axis data unit label ---
+AxisDispUnitsConverter axisDispUnitsConverter (*this,
mrModel.mxDispUnits.getOrCreate());
+axisDispUnitsConverter.convertFromModel(xAxis);
}
catch( Exception& )
{
@@ -360,6 +364,26 @@ void AxisConverter::convertFromModel( const Reference<
XCoordinateSystem >& rxCo
//
+AxisDispUnitsConverter::AxisDispUnitsConverter( const ConverterRoot& rParent,
AxisDispUnitsModel& rModel ) :
+ConverterBase< AxisDispUnitsModel >( rParent, rModel )
+{
+}
+
+AxisDispUnitsConverter::~AxisDispUnitsConverter()
+{
+}
+
+void AxisDispUnitsConverter::convertFromModel( const Reference< XAxis >&
rxAxis )
+{
+PropertySet aPropSet( rxAxis );
+if (!(mrModel.mnBuiltInUnit).isEmpty() )
+{
+aPropSet.setProperty(PROP_DisplayUnits, true);
+aPropSet.setProperty( PROP_BuiltInUnit, mrModel.mnBuiltInUnit );
+
[Libreoffice-commits] core.git: chart2/qa oox/source
chart2/qa/extras/chart2export.cxx| 10 ++
chart2/qa/extras/data/docx/DisplayUnits.docx |binary
oox/source/export/chartexport.cxx| 25 +
3 files changed, 35 insertions(+)
New commits:
commit 1d497297ec9bc2ed00bbc8f586a67c76eaa7013d
Author: sushil_shinde
Date: Wed Jan 29 14:34:35 2014 +0530
fdo#74112 Write Chart Displayunits information back to XML.
During export access properties stored during import
and write back those. Currently we just support basic chart
display unit information such as builtinunit, there are more
properties ex. custUnit, dispUnitsLbl, extLst.
which are pending.
Conflicts:
chart2/qa/extras/chart2export.cxx
Change-Id: I87e0a8322fc0b0c3df2b8053b7f29fffea611040
Reviewed-on: https://gerrit.libreoffice.org/7722
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index e164296..399c0bb 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -42,6 +42,7 @@ public:
void testAreaChartLoad();
void testUpDownBars();
void testDoughnutChart();
+void testDisplayUnits();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(test);
@@ -56,6 +57,7 @@ public:
CPPUNIT_TEST(testAreaChartLoad);
CPPUNIT_TEST(testUpDownBars);
CPPUNIT_TEST(testDoughnutChart);
+CPPUNIT_TEST(testDisplayUnits);
CPPUNIT_TEST_SUITE_END();
protected:
@@ -533,6 +535,14 @@ void Chart2ExportTest::testDoughnutChart()
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:doughnutChart",
"1");
}
+void Chart2ExportTest::testDisplayUnits()
+{
+load("/chart2/qa/extras/data/docx/", "DisplayUnits.docx");
+xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML
Text");
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:dispUnits/c:builtInUnit", "val",
"billions");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/docx/DisplayUnits.docx
b/chart2/qa/extras/data/docx/DisplayUnits.docx
new file mode 100644
index 000..97092a3
Binary files /dev/null and b/chart2/qa/extras/data/docx/DisplayUnits.docx differ
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 1c82816..dbbeb07 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2389,6 +2389,31 @@ void ChartExport::_exportAxis(
FSEND );
}
+sal_Bool bDisplayUnits = sal_False;
+if(GetProperty( xAxisProp, "DisplayUnits" ) )
+{
+mAny >>= bDisplayUnits;
+if(bDisplayUnits)
+{
+OUString aVal;
+pFS->startElement( FSNS( XML_c, XML_dispUnits ),
+FSEND );
+if(GetProperty( xAxisProp, "BuiltInUnit" ))
+{
+mAny >>= aVal;
+if(!aVal.isEmpty())
+{
+OString aBuiltInUnit = OUStringToOString(aVal,
RTL_TEXTENCODING_UTF8);
+pFS->singleElement( FSNS( XML_c, XML_builtInUnit ),
+XML_val, aBuiltInUnit.getStr(),
+FSEND );
+}
+ }
+ pFS->singleElement(FSNS( XML_c, XML_dispUnitsLbl ),FSEND);
+ pFS->endElement( FSNS( XML_c, XML_dispUnits ) );
+
+}
+}
// TODO: text properties
pFS->endElement( FSNS( XML_c, nAxisType ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source include/xmloff offapi/com xmloff/source
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 20 -
chart2/source/model/main/Axis.cxx| 22 ++-
include/xmloff/xmltoken.hxx |3 ++
offapi/com/sun/star/chart2/Axis.idl | 12
xmloff/source/chart/PropertyMap.hxx |3 ++
xmloff/source/core/xmltoken.cxx |2 +
6 files changed, 60 insertions(+), 2 deletions(-)
New commits:
commit 83055835b1425b0a9d2fe5dce2f4db2d7a61919d
Author: sushil_shinde
Date: Wed Jan 29 14:31:19 2014 +0530
fdo#74112 Preserve Chart displayunits properties during ODF import/export.
Change-Id: I38508b71ee5b3b966e1d36b0d253304fe17c0ec0
Reviewed-on: https://gerrit.libreoffice.org/7721
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 665ea53..fd44cce 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -98,7 +98,9 @@ enum
PROP_AXIS_CAN_OVERLAP,
PROP_AXIS_STACKEDTEXT,
PROP_AXIS_OVERLAP,
-PROP_AXIS_GAP_WIDTH
+PROP_AXIS_GAP_WIDTH,
+PROP_AXIS_DISPLAY_UNITS,
+PROP_AXIS_BUILTINUNIT
};
void lcl_AddPropertiesToVector(
@@ -336,6 +338,22 @@ void lcl_AddPropertiesToVector(
::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
//#i111967# no PropertyChangeEvent is fired on change so far
beans::PropertyAttribute::MAYBEDEFAULT ));
+
+//Properties for display units:
+rOutProperties.push_back(
+Property( "DisplayUnits",
+ PROP_AXIS_DISPLAY_UNITS,
+ ::getBooleanCppuType(),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
+
+//Properties for labels:
+rOutProperties.push_back(
+Property( "BuiltInUnit",
+ PROP_AXIS_BUILTINUNIT,
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
}
struct StaticAxisWrapperPropertyArray_Initializer
diff --git a/chart2/source/model/main/Axis.cxx
b/chart2/source/model/main/Axis.cxx
index f8a3b90..a94a7d7 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -76,7 +76,10 @@ enum
PROP_AXIS_MAJOR_TICKMARKS,
PROP_AXIS_MINOR_TICKMARKS,
-PROP_AXIS_MARK_POSITION
+PROP_AXIS_MARK_POSITION,
+
+PROP_AXIS_DISPLAY_UNITS,
+PROP_AXIS_BUILTINUNIT
};
void lcl_AddPropertiesToVector(
@@ -180,6 +183,22 @@ void lcl_AddPropertiesToVector(
PROP_AXIS_MARK_POSITION,
::getCppuType( reinterpret_cast< const
::com::sun::star::chart::ChartAxisMarkPosition * >(0)),
beans::PropertyAttribute::MAYBEDEFAULT ));
+
+//Properties for display units:
+rOutProperties.push_back(
+Property( "DisplayUnits",
+ PROP_AXIS_DISPLAY_UNITS,
+ ::getBooleanCppuType(),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
+
+//Properties for labels:
+rOutProperties.push_back(
+Property( "BuiltInUnit",
+ PROP_AXIS_BUILTINUNIT,
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
}
struct StaticAxisDefaults_Initializer
@@ -214,6 +233,7 @@ private:
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >(
rOutMap, PROP_AXIS_MAJOR_TICKMARKS, 2 /* CHAXIS_MARK_OUTER */ );
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >(
rOutMap, PROP_AXIS_MINOR_TICKMARKS, 0 /* CHAXIS_MARK_NONE */ );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap,
PROP_AXIS_MARK_POSITION,
::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS );
+::chart::PropertyHelper::setPropertyValueDefault( rOutMap,
PROP_AXIS_DISPLAY_UNITS, false );
}
};
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 16ddf69..225e374 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3227,6 +3227,9 @@ namespace xmloff { namespace token {
XML_CHART_DTABLE_SHOWHORZBORDER,
XML_CHART_DTABLE_SHOWVERTBORDER,
XML_CHART_DTABLE_SHOWOUTLINE,
+// Chart Display units properties
+XML_CHART_DUNITS_DISPLAYUNITS,
+XML_CHART_DUNITS_BUILTINUNIT,
XML_EXTERNALDATA,
XML_TOKEN_END
diff --git a/offapi/com/sun/star/chart2/Axis.idl
b/offapi/com/sun/star/chart2/Axis.idl
index b2fe0b7..c27bf8a 100644
-
[Bug 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938
--- Comment #55 from Alexandre Vicenzi ---
Stephan,
I'm trying to adjust PopupMenuToolbarController
(framework/source/uielement/popuptoolbarcontroller.cxx), but I'm getting some
errors.
I tried this approach:
class PopupMenuToolbarController : public ::cppu::WeakImplHelper2<
svt::ToolboxController, css::lang::XServiceInfo >
And I get these errors:
In file included from
./framework/source/uielement/popuptoolbarcontroller.cxx:21:0:
./include/cppuhelper/implbase2.hxx: In instantiation of ‘class
cppu::WeakImplHelper2’:
./framework/source/uielement/popuptoolbarcontroller.cxx:50:51: required from
here
./include/cppuhelper/implbase2.hxx:94:69: warning: direct base
‘cppu::OWeakObject’ inaccessible in
‘cppu::WeakImplHelper2’ due to ambiguity [enabled by default]
class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE SAL_DLLPUBLIC_EXPORT
WeakImplHelper2
^
./framework/source/uielement/popuptoolbarcontroller.cxx: In constructor
‘{anonymous}::PopupMenuToolbarController::PopupMenuToolbarController(const
com::sun::star::uno::Reference&, const
rtl::OUString&)’:
./framework/source/uielement/popuptoolbarcontroller.cxx:84:12: error: type
‘svt::ToolboxController’ is not a direct base of
‘{anonymous}::PopupMenuToolbarController’
: svt::ToolboxController()
What I'm missing? Or what is the correct way to do this. I tried multiple
inheritance and didn't work too.
--
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 7da3f43e636112b30a15d29de2f419d4b82dcb38 Author: Julien Nabet Date: Tue Feb 11 22:39:00 2014 +0100 Resolves: fdo#74820 Failed to recognized Heading 6-Export to MediaWiki See http://www.mediawiki.org/wiki/Help:Formatting Change-Id: I6cf50e957d3aef6bff6e86a031da175d5544e98c diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 6a44ecd..6992249 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -296,14 +296,14 @@ Function generating a wiki heading prefix. @param level - The heading level. The value must be between 1 and 5. + The heading level. The value must be between 1 and 6. --> - + - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - i18npool/source i18npool/util include/vcl vcl/source
i18npool/source/inputchecker/inputsequencechecker.cxx | 12 +---
i18npool/source/registerservices/registerservices.cxx |5 -
i18npool/util/i18npool.component |3 ++-
include/vcl/edit.hxx |4 +++-
include/vcl/texteng.hxx |3 ++-
vcl/source/control/edit.cxx | 14 +-
vcl/source/edit/texteng.cxx | 11 +--
7 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 76f5ce409fc9c3985d475f9e41d1b38cfd9f1ec2
Author: Matúš Kukan
Date: Mon Feb 10 18:44:48 2014 +0100
more similar handling of InputSequenceChecker as in other places
Change-Id: Ia6efc0eda03dac87c73e720d08f320ce3fc6ce4a
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 471e5d3..4d6566a 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -86,6 +86,8 @@ private:
LinkmaUpdateDataHdl;
LinkmaAutocompleteHdl;
+css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC;
+
DECL_DLLPRIVATE_LINK( ImplUpdateDataHdl, void* );
SAL_DLLPRIVATE boolImplTruncateToMaxLen( OUString&, sal_Int32
nSelectionLen ) const;
@@ -112,7 +114,7 @@ private:
SAL_DLLPRIVATE voidImplCopy( ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard );
SAL_DLLPRIVATE voidImplPaste( ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard );
SAL_DLLPRIVATE longImplGetTextYPosition() const;
-SAL_DLLPRIVATE ::com::sun::star::uno::Reference <
::com::sun::star::i18n::XExtendedInputSequenceChecker >
ImplGetInputSequenceChecker() const;
+SAL_DLLPRIVATE ::com::sun::star::uno::Reference <
::com::sun::star::i18n::XExtendedInputSequenceChecker >
ImplGetInputSequenceChecker();
SAL_DLLPRIVATE ::com::sun::star::uno::Reference <
::com::sun::star::i18n::XBreakIterator > ImplGetBreakIterator() const;
protected:
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 163d62c..fd6afcf 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -104,6 +104,7 @@ private:
::com::sun::star::lang::Locale maLocale;
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >
mxBreakIterator;
+css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC;
Rectangle maInvalidRect;
Range maInvalidRange;
@@ -159,7 +160,7 @@ protected:
// gets not exported. First and seconf parameter swapped to have a
different signatur.
SAL_DLLPRIVATE TextPaM ImpInsertText( sal_Unicode c, const TextSelection&
rSel, sal_Bool bOverwrite = sal_False, sal_Bool bIsUserInput = sal_False );
// some other new functions needed that must not be exported to remain
compatible
-SAL_DLLPRIVATE ::com::sun::star::uno::Reference <
::com::sun::star::i18n::XExtendedInputSequenceChecker >
GetInputSequenceChecker() const;
+SAL_DLLPRIVATE ::com::sun::star::uno::Reference <
::com::sun::star::i18n::XExtendedInputSequenceChecker >
GetInputSequenceChecker();
SAL_DLLPRIVATE sal_Bool IsInputSequenceCheckingRequired( sal_Unicode c,
const TextSelection& rCurSel ) const;
// broadcast or adjust selections
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 1a0d04c..2e8b3f9 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -834,18 +834,14 @@ uno::Reference < i18n::XBreakIterator >
Edit::ImplGetBreakIterator() const
}
// ---
-uno::Reference < i18n::XExtendedInputSequenceChecker >
Edit::ImplGetInputSequenceChecker() const
+uno::Reference < i18n::XExtendedInputSequenceChecker >
Edit::ImplGetInputSequenceChecker()
{
-//!! since we don't want to become incompatible in the next minor update
-//!! where this code will get integrated into, xISC will be a local
-//!! variable instead of a class member!
-uno::Reference < i18n::XExtendedInputSequenceChecker > xISC;
-//if ( !xISC.is() )
+if ( !mxISC.is() )
{
-uno::Reference< uno::XComponentContext > xContext =
::comphelper::getProcessComponentContext();
-xISC = i18n::InputSequenceChecker::create(xContext);
+mxISC = i18n::InputSequenceChecker::create(
+::comphelper::getProcessComponentContext() );
}
-return xISC;
+return mxISC;
}
// ---
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index a0e27e8..7e8037d 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -628,15 +628,14 @@ void TextEngine::ImpRemoveParagraph( sal_uLong nPara )
ImpParagraphRemoved( nPara );
}
-uno::Reference < i
[Libreoffice-commits] core.git: include/oox oox/source sw/qa
include/oox/export/drawingml.hxx|2
oox/source/drawingml/shape.cxx | 17 +--
oox/source/export/drawingml.cxx | 27
sw/qa/extras/ooxmlexport/data/shape-theme-preservation.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 15 +-
5 files changed, 36 insertions(+), 25 deletions(-)
New commits:
commit 42e4d237692a10aaecabbc3499d14d3860d93478
Author: Jacobo Aragunde Pérez
Date: Tue Feb 11 19:07:00 2014 +0100
ooxml: Preserve color transformations for shape theme colors
Colors can have modifiers like in the following example:
In the case of RGB colors, the transformations are merged within the
RGB color itself on import, so there's no need to preserve the
original transformations, but that's necessary in the case of scheme
colors.
Slightly modified an existing unit test to check this feature too.
Change-Id: I3a03a56f2b633f283c392e54842b326bd4df316b
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 7a07f5e..84ac606 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -127,7 +127,7 @@ public:
void WriteConnectorConnections( EscherConnectorListEntry& rConnectorEntry,
sal_Int32 nStartID, sal_Int32 nEndID );
void WriteSolidFill( sal_uInt32 nColor, sal_Int32 nAlpha = MAX_PERCENT );
-void WriteSolidFill( OUString sSchemeName, sal_Int32 nAlpha = MAX_PERCENT
);
+void WriteSolidFill( OUString sSchemeName,
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
aTransformations );
void WriteSolidFill( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteGradientFill( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteBlipFill( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > rXPropSet, OUString sURLPropName,
sal_Int32 nXmlNamespace );
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 99940ab..fb17f5d 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -782,22 +782,29 @@ Reference< XShape > Shape::createAndInsert(
}
// Store original fill and line colors of the shape and the theme
color name to InteropGrabBag
+Sequence< PropertyValue > aProperties( 6 ); //allocate the
maximum possible number of slots
sal_Int32 nSize = 2;
-Sequence< PropertyValue > aProperties( nSize );
PUT_PROP( aProperties, 0, "OriginalSolidFillClr",
aShapeProps[PROP_FillColor] );
PUT_PROP( aProperties, 1, "OriginalLnSolidFillClr",
aShapeProps[PROP_LineColor] );
OUString sColorFillScheme =
aFillProperties.maFillColor.getSchemeName();
if( !aFillProperties.maFillColor.isPlaceHolder() &&
!sColorFillScheme.isEmpty() )
{
-aProperties.realloc( ++nSize );
-PUT_PROP( aProperties, nSize - 1, "SpPrSolidFillSchemeClr",
sColorFillScheme );
+PUT_PROP( aProperties, nSize, "SpPrSolidFillSchemeClr",
sColorFillScheme );
+nSize++;
+PUT_PROP( aProperties, nSize,
"SpPrSolidFillSchemeClrTransformations",
+ aFillProperties.maFillColor.getTransformations() );
+nSize++;
}
OUString sLnColorFillScheme =
aLineProperties.maLineFill.maFillColor.getSchemeName();
if( !aLineProperties.maLineFill.maFillColor.isPlaceHolder() &&
!sLnColorFillScheme.isEmpty() )
{
-aProperties.realloc( ++nSize );
-PUT_PROP( aProperties, nSize - 1, "SpPrLnSolidFillSchemeClr",
sLnColorFillScheme );
+PUT_PROP( aProperties, nSize, "SpPrLnSolidFillSchemeClr",
sLnColorFillScheme );
+nSize++;
+PUT_PROP( aProperties, nSize,
"SpPrLnSolidFillSchemeClrTransformations",
+
aLineProperties.maLineFill.maFillColor.getTransformations() );
+nSize++;
}
+aProperties.realloc( nSize ); //shrink the Sequence if we didn't
use all the slots
putPropertiesToGrabBag( aProperties );
// Store original gradient fill of the shape to InteropGrabBag
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 0058aa7..0f95e70 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -219,21 +219,10 @@ void DrawingML::WriteSolidFill( sal_uInt32 nColor,
sal_Int32 nAlpha )
mpFS->endElementNS( XML_a, XML_solidFill );
}
-void DrawingML::WriteSolidFill( OUString sSchemeName, sal_Int32 nAlpha )
+void DrawingML::WriteSolidFill( OUString sSchemeName, Sequence< Proper
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/sidebarparagraph.ui | 514 +++- 1 file changed, 275 insertions(+), 239 deletions(-) New commits: commit b436bbf16a324439ad864465bfd9120c03a02f38 Author: Caolán McNamara Date: Tue Feb 11 21:14:09 2014 + Resolves: fdo#74681 group related elements into vertical containers Change-Id: Ie30890a44b5920516809f7df6cc024d9fb6accca diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui index 97b87b1..9be67f3 100644 --- a/svx/uiconfig/ui/sidebarparagraph.ui +++ b/svx/uiconfig/ui/sidebarparagraph.ui @@ -1,7 +1,7 @@ - + 100 @@ -11,8 +11,6 @@ True False -True -True True @@ -318,242 +316,6 @@ - -True -False -6 - - -True -False -15 -svx/res/symphony/spacing1.png - - -False -True -0 - - - - -True -True -True -Above Paragraph Spacing -Above Paragraph Spacing -True -⢠-adjustment1 - - -False -True -1 - - - - -0 -4 -1 -1 - - - - -True -False -6 - - -True -False -svx/res/symphony/spacing2.png - - -False -True -0 - - - - -True -True -True -Below Paragraph Spacing -Below Paragraph Spacing -True -⢠-adjustment1 - - -False -True -1 - - - - -0 -5 -1 -1 - - - - -True -False -6 - - -True -False -svx/res/symphony/Indent4.png - - -False -True -0 - - - - -True -True -Before Text Indent -True -⢠-adjustment1 - - -False -True -1 - - - - -1 -4 -1 -1 - - - - -True -False -6 - - -True -False -svx/res/symphony/Indent3.png - - -False -True -0 - - - - -True -True -After Text Indent -True -⢠-adjustment1 - - -False -True -1 - - - - -1 -5 -1 -1 - - - - -True -False -6 - - -True -False -svx/res/symphony/Indent2.png - - -False -True -0 - - - - -True -True -First Line Indent -True -⢠-adjustment1 - - -False -True -1 - - - - -1 -6 -1 -1 - - - - -True -False -True -Line Spacing -Line Spacing -True - - -True -False -True -Line Spacing -Line Spacing -.uno:LineSpacing -True -
Re: OpenGL on Linux
Hey, On Mon, Feb 10, 2014 at 7:57 PM, Anthonys Lists wrote: > On 10/02/2014 13:32, Ruslan Kabatsayev wrote: > >> I'd like to note that there're still lots of video cards which are not >> even 2.0 capable - e.g. intel video in my EEE PC 1015PN only supports >> OpenGL 1.4 with ARB assembly shaders. Another example would be >> (although quite old, but still working and actively supported by intel >> in Mesa) i915G chipset, which has similar characteristics. >> Also, if you try using Mesa 9.1+ with these, you'll get (exactly, not >> higher than) OpenGL 2.1 advertised, but really giving you software >> fallbacks every now and then. >> So, I'd not like to have an office suite require OpenGL higher than >> 1.4 (it may use higher versions if they are available, but still not >> require). >> > I'll add that I have literally just retired my old No 2 workstation which > had a Matrox Millenium or similar graphics card - and have also re-purposed > a Matrox G440. I don't know what OpenGL these are, but the hardware is all > Y2K era, and still working fine. I suspect that's older than i915 (the > processors are Socket A). > > I'm sorry but there is no chance that I will support OpenGL 1.x with this feature. Even if there is still hardware out there it amkes no sense to work with a standard that is so old that it has been deprecated by Khronos several years ago. We will simply not support this feature on such hardware. Luckily glew allows us to make this a runtime check so it will just not be available. It is a bit more complicated with OpenGL 2.x and 3.x as they are much closer. As it seems most people already have support for 3.x on Linux + everyone on Windows and modern Macs. In general every recommendation is to avoid using the compatibility context and use the new core context that was introduced with 3.0. Targeting OpenGl 1.x with the fixed pipeline is just stupid while writing new code. In general we are making the OpenGL stuff right now runtime optional by using glew while it was compile time optional before. In general I'm one of the persons who is more in favor of dropping support for older versions but I had some discussions with other developers who disagree. We will see how this plays out. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-website] Re: [ANN] sort Gerrit and askbot downtime at ~ 14:00 UTC today
Hi, Christian Lohmaier wrote on 2014-02-11 21:22: now gerrit back up again as well (change of IP is only temporary) many kudos to Cloph and Alex for their great work on this, it is really, really appreciated, and you two did a great job! As for the other VMs and getting back previous IPs, we'll work on these tomorrow. Thanks again! Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANN] sort Gerrit and askbot downtime at ~ 14:00 UTC today
Hi *, On Tue, Feb 11, 2014 at 3:29 PM, Christian Lohmaier wrote: > On Tue, Feb 11, 2014 at 1:50 PM, Christian Lohmaier > wrote: >> >> at around 14:00 UTC today gerrit and askbot will have a short >> maintenance downtime and change of IP (temporarily) >> >> The change of IP might cause delays until you can access the services >> at the new, temporary IP, depending how fast your DNS updates. >> >> gerrit will be reachable at 144.76.139.237 >> askbot will be reachable at 144.76.139.238 now gerrit back up again as well (change of IP is only temporary) ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2540c06a238123b1284912d4d85a6ae873fffd2f Author: Caolán McNamara Date: Tue Feb 11 16:42:56 2014 + Updated core Project: help 9258c546f6099aad763cb12fc38586e90c93b814 diff --git a/helpcontent2 b/helpcontent2 index b25ad89..9258c54 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b25ad898a35fc268897622a3068179da5f8d819b +Subproject commit 9258c546f6099aad763cb12fc38586e90c93b814 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3c/2b5242e81575ec4b6c110afd88894670bd2283
3c/2b5242e81575ec4b6c110afd88894670bd2283 |1 + 1 file changed, 1 insertion(+) New commits: commit 4831c572028e5e31cb8a9819914ed58cca928dd2 Author: Caolán McNamara Date: Tue Feb 11 20:23:05 2014 + Notes added by 'git notes add' diff --git a/3c/2b5242e81575ec4b6c110afd88894670bd2283 b/3c/2b5242e81575ec4b6c110afd88894670bd2283 new file mode 100644 index 000..c52152c --- /dev/null +++ b/3c/2b5242e81575ec4b6c110afd88894670bd2283 @@ -0,0 +1 @@ +merged as: 50f0bb85b7e18001886fdf8bb03eb1d138838b90 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |3 --- 1 file changed, 3 deletions(-) New commits: commit 9258c546f6099aad763cb12fc38586e90c93b814 Author: Caolán McNamara Date: Tue Feb 11 16:42:56 2014 + remove unused helpids Change-Id: I7920e1450d89c1d174cc9498c5dc1ab659e4f2bd diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index b34d859..0f14f18 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5781,8 +5781,6 @@ sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_BORDER,1493533717, sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_FONT,1493533719, sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_NUMFORMAT,1493533716, sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_PATTERN,1493533720, -sc_CheckBox_RID_SCDLG_CHARTCOLROW_1,1494516737, -sc_CheckBox_RID_SCDLG_CHARTCOLROW_2,1494516738, sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_LAYOUT_EMPTY,1495401474, sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_SHOW,1495401475, sc_CheckBox_RID_SCDLG_MOVETAB_BTN_COPY,1493451781, @@ -5854,7 +5852,6 @@ sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973, sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974, sc_ListBox_TP_VALIDATION_VALUES_LB_ALLOW,548277762, sc_ListBox_TP_VALIDATION_VALUES_LB_VALUE,548277765, -sc_ModalDialog_RID_SCDLG_CHARTCOLROW,1494515712, sc_ModalDialog_RID_SCDLG_GROUP,1493549056, sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592, sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Deprecate ?
Regina Henschel wrote: > It is about the old style animations, which does not work since > refactoring of presentations in OOo2. > Hmm. So there's sd/source/core/EffectMigration.cxx, which in turn gets used by Impress' uno implementation in sd/source/ui/unoidl/unoobj.cxx. And I see odf importer code at xmloff/source/draw/animimp.cxx, used from ximppage.cxx. > Is see two options (see the discussion and my comment 7 there) > (1) Implement element . > (2) Suggest to OASIS to deprecate the element and its children in > ODF1.3. and later remove it. > > What do you think about option (2)? > > Do you know any application that supports ? > So my hunch is both LibreOffice and AOO still support at least a subset of that (one would have to create a few old-style animations in OOo 1.x to verify if it actually _works_). On the other hand, clearly all of that is superseded by the SMIL stuff (which is much more expressive anyway), so deprecation sounds like a pragmatic choice to reduce pointless duplication in the standard... Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 33 -
writerfilter/source/doctok/resources.xmi | 557 ---
2 files changed, 590 deletions(-)
New commits:
commit 66728778fc4d97180b7822f60e56e3354bbb57b8
Author: Miklos Vajna
Date: Tue Feb 11 19:39:22 2014 +0100
writerfilter: unused sprms
Change-Id: Ib42ea0d9437eb2ade9c3049a2e9baa7747c5e86d
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 5751e33..8c5ace6 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1286,20 +1286,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
if (pSectionContext != NULL)
pSectionContext->Insert(PROP_WRITING_MODE, uno::makeAny(
text::WritingMode2::RL_TB));
break;
-case NS_sprm::LN_CFRMarkDel:
-break; // sprmCFRMarkDel
-case NS_sprm::LN_CFRMark:
-break; // sprmCFRMark
-case NS_sprm::LN_CFFldVanish:
-break; // sprmCFFldVanish
-case NS_sprm::LN_CDttmRMark:
-break; // sprmCDttmRMark
-case NS_sprm::LN_CFData:
-break; // sprmCFData
-case NS_sprm::LN_CChs:
-break; // sprmCChs
-case NS_sprm::LN_CFOle2:
-break; // sprmCFOle2
case NS_sprm::LN_CHighlight:
{
sal_Int32 nColor = 0;
@@ -1309,10 +1295,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny(
mnBackgroundColor ));
}
break; // sprmCHighlight
-case NS_sprm::LN_CFFtcAsciSymb:
-break; // sprmCFFtcAsciSymb
-case NS_sprm::LN_CDefault:
-break; // sprmCDefault
case NS_sprm::LN_CKcd:
rContext->Insert(PROP_CHAR_EMPHASIS, uno::makeAny ( getEmphasisValue
(nIntValue)));
break; // sprmCKcd
@@ -1593,8 +1575,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
rContext->Insert(PROP_CHAR_RELIEF,
uno::makeAny( nIntValue ? awt::FontRelief::ENGRAVED :
awt::FontRelief::NONE ));
break;
-case NS_sprm::LN_CFObj:
-break; // sprmCFObj
case NS_sprm::LN_CSfxText:
// The file-format has many character animations. We have only
// one, so we use it always. Suboptimal solution though.
@@ -1605,14 +1585,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
break; // sprmCSfxText
case NS_sprm::LN_CFBiDi:
break; // sprmCFBiDi
-case NS_sprm::LN_CFDiacColor:
-break; // sprmCFDiacColor
-case NS_sprm::LN_CDispFldRMark:
-break; // sprmCDispFldRMark
-case NS_sprm::LN_CDttmRMarkDel:
-break; // sprmCDttmRMarkDel
-case NS_sprm::LN_CBrc:
-break; // sprmCBrc
case NS_sprm::LN_CShd:
{
//contains fore color, back color and shadow percentage, results
in a brush
@@ -1626,8 +1598,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
}
break;
}
-case NS_sprm::LN_CCpg:
-break; // sprmCCpg
case NS_sprm::LN_CLidBi: // sprmCLidBi language complex
case NS_sprm::LN_CRgLid0:// sprmCRgLid0language Western
case NS_sprm::LN_CRgLid1:// sprmCRgLid1language Asian
@@ -1760,9 +1730,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
case 0xd236:
case 0xd237:
break;//undocumented section properties
-case NS_sprm::LN_CEastAsianLayout:
-resolveSprmProps(*this, rSprm);
-break;
case NS_ooxml::LN_CT_Tabs_tab:
resolveSprmProps(*this, rSprm);
m_pImpl->IncorporateTabStop(m_pImpl->m_aCurrentTabStop);
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index 3e7d5b8..219b522 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -1007,223 +1007,6 @@
-
-
-
-
-
-
-
- 0x0800
-
-
-
-
-
-
-
-
rtf:sprmCFRMarkDel
-
-
-
-
-
-
-
- character
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0x0801
-
-
-
-
-
-
-
-
rtf:sprmCFRMark
-
-
-
-
-
-
-
-
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/qa sc/source
sc/inc/document.hxx |7 ++--
sc/qa/unit/data/ods/formula-delete-contents.ods |binary
sc/qa/unit/subsequent_filters-test.cxx | 36
sc/qa/unit/ucalc_formula.cxx| 36
sc/source/core/data/column2.cxx |4 +-
sc/source/core/data/documen7.cxx|2 -
sc/source/core/data/document.cxx|4 +-
sc/source/ui/docshell/docsh.cxx |2 -
sc/source/ui/docshell/docsh3.cxx|2 -
sc/source/ui/view/gridwin4.cxx |2 -
10 files changed, 84 insertions(+), 11 deletions(-)
New commits:
commit 2ec3127da35933fc6d5ac47ecedd0267f67c1d62
Author: Kohei Yoshida
Date: Tue Feb 11 13:28:47 2014 -0500
Ensure that vector array has a numeric array of NaN's for empty range.
With this change, we ensure that mpNumArray is never NULL even when the
range consists entirely of empty cells. For an empty range, mpNumArray
will be non-NULL and filled with NaN's while mpStrArray will be NULL.
Change-Id: If5cead26ebe917af150cf7e39e17afe3f310beb7
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 032675b..1294503 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2047,9 +2047,10 @@ public:
formula::VectorRefArray FetchVectorRefArray( const ScAddress& rPos, SCROW
nLength );
/**
- * Called whenever the value of a cell inside the document is modified.
+ * Call this before any operations that might trigger one or more formula
+ * cells to get calculated.
*/
-void CellContentModified();
+void ClearFormulaContext();
SvtBroadcaster* GetBroadcaster( const ScAddress& rPos );
const SvtBroadcaster* GetBroadcaster( const ScAddress& rPos ) const;
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index a4b6289..75553ae 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -490,6 +490,42 @@ void Test::testFetchVectorRefArray()
CPPUNIT_ASSERT_MESSAGE("Array should NOT have a string array.",
!aArray.mpStringArray);
CPPUNIT_ASSERT_MESSAGE("Unexpected string cell.", equals(aArray, 0, 5.0));
+// Clear everything and start over.
+clearRange(m_pDoc, ScRange(0,0,0,MAXCOL,MAXROW,0));
+m_pDoc->ClearFormulaContext();
+
+// Totally empty range in a totally empty column (Column A).
+aArray = m_pDoc->FetchVectorRefArray(ScAddress(0,0,0), 3); // A1:A3
+CPPUNIT_ASSERT_MESSAGE("Array should have a numeric array.",
aArray.mpNumericArray);
+CPPUNIT_ASSERT_MESSAGE("Array should NOT have a string array.",
!aArray.mpStringArray);
+CPPUNIT_ASSERT(rtl::math::isNan(aArray.mpNumericArray[0]));
+CPPUNIT_ASSERT(rtl::math::isNan(aArray.mpNumericArray[1]));
+CPPUNIT_ASSERT(rtl::math::isNan(aArray.mpNumericArray[2]));
+
+// Totally empty range in a non-empty column (Column B).
+m_pDoc->SetString(ScAddress(1,10,0), "Some text"); // B11
+aArray = m_pDoc->FetchVectorRefArray(ScAddress(1,0,0), 3); // B1:B3
+CPPUNIT_ASSERT_MESSAGE("Array should have a numeric array.",
aArray.mpNumericArray);
+CPPUNIT_ASSERT_MESSAGE("Array should NOT have a string array.",
!aArray.mpStringArray);
+CPPUNIT_ASSERT(rtl::math::isNan(aArray.mpNumericArray[0]));
+CPPUNIT_ASSERT(rtl::math::isNan(aArray.mpNumericArray[1]));
+CPPUNIT_ASSERT(rtl::math::isNan(aArray.mpNumericArray[2]));
+
+aArray = m_pDoc->FetchVectorRefArray(ScAddress(1,12,0), 3); // B13:B15
+CPPUNIT_ASSERT_MESSAGE("Array should have a numeric array.",
aArray.mpNumericArray);
+CPPUNIT_ASSERT_MESSAGE("Array should NOT have a string array.",
!aArray.mpStringArray);
+CPPUNIT_ASSERT(rtl::math::isNan(aArray.mpNumericArray[0]));
+CPPUNIT_ASSERT(rtl::math::isNan(aArray.mpNumericArray[1]));
+CPPUNIT_ASSERT(rtl::math::isNan(aArray.mpNumericArray[2]));
+
+// These values come from a cache because of the call above.
+aArray = m_pDoc->FetchVectorRefArray(ScAddress(1,1,0), 3); // B2:B4
+CPPUNIT_ASSERT_MESSAGE("Array should have a numeric array.",
aArray.mpNumericArray);
+CPPUNIT_ASSERT_MESSAGE("Array should NOT have a string array.",
!aArray.mpStringArray);
+CPPUNIT_ASSERT(rtl::math::isNan(aArray.mpNumericArray[0]));
+CPPUNIT_ASSERT(rtl::math::isNan(aArray.mpNumericArray[1]));
+CPPUNIT_ASSERT(rtl::math::isNan(aArray.mpNumericArray[2]));
+
m_pDoc->DeleteTab(0);
}
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index e601540..2c3e58a 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2591,7 +2591,7 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray(
SCROW nRow1, SCROW nRow2
if (pColArray)
{
const double* pNum = NULL;
-if (pColArray->mpNumArray && hasNonEmpty(*pColArray->mpNumArray,
nRow1, nRow2))
+if (pColArray->mpNumArray)
pNum
Deprecate ?
Hi all, I came incidentally across issue https://issues.apache.org/ooo/show_bug.cgi?id=42894 It is about the old style animations, which does not work since refactoring of presentations in OOo2. Is see two options (see the discussion and my comment 7 there) (1) Implement element . (2) Suggest to OASIS to deprecate the element and its children in ODF1.3. and later remove it. What do you think about option (2)? Do you know any application that supports ? Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: OpenGL on Linux
On 10/02/2014 13:32, Ruslan Kabatsayev wrote: I'd like to note that there're still lots of video cards which are not even 2.0 capable - e.g. intel video in my EEE PC 1015PN only supports OpenGL 1.4 with ARB assembly shaders. Another example would be (although quite old, but still working and actively supported by intel in Mesa) i915G chipset, which has similar characteristics. Also, if you try using Mesa 9.1+ with these, you'll get (exactly, not higher than) OpenGL 2.1 advertised, but really giving you software fallbacks every now and then. So, I'd not like to have an office suite require OpenGL higher than 1.4 (it may use higher versions if they are available, but still not require). I'll add that I have literally just retired my old No 2 workstation which had a Matrox Millenium or similar graphics card - and have also re-purposed a Matrox G440. I don't know what OpenGL these are, but the hardware is all Y2K era, and still working fine. I suspect that's older than i915 (the processors are Socket A). Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Aditya Kale All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license.
___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Honza Havlíček license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
can't use "with-gcc-home"
Hi, I've this error message with autogen: configure: error: unrecognized options: --with-gcc-home any ideas? Ahmad Warning: This message and its attachment, if any, are confidential and may contain information protected by law. If you are not the intended recipient, please contact the sender immediately and delete the message and its attachment, if any. You should not copy the message and its attachment, if any, or disclose its contents to any other person or use it for any purpose. Statements and opinions expressed in this e-mail and its attachment, if any, are those of the sender, and do not necessarily reflect those of King Abdulaziz city for Science and Technology (KACST) in the Kingdom of Saudi Arabia. KACST accepts no liability for any damage caused by this email. تحذير: هذه الرسالة وما تحويه من مرفقات (إن وجدت) تمثل وثيقة سرية قد تحتوي على معلومات محمية بموجب القانون. إذا لم تكن الشخص المعني بهذه الرسالة فيجب عليك تنبيه المُرسل بخطأ وصولها إليك، وحذف الرسالة ومرفقاتها (إن وجدت)، ولا يجوز لك نسخ أو توزيع هذه الرسالة أو مرفقاتها (إن وجدت) أو أي جزء منها، أو البوح بمحتوياتها للغير أو استعمالها لأي غرض. علماً بأن فحوى هذه الرسالة ومرفقاتها (ان وجدت) تعبر عن رأي المُرسل وليس بالضرورة رأي مدينة الملك عبدالعزيز للعلوم والتقنية بالمملكة العربية السعودية، ولا تتحمل المدينة أي مسئولية عن الأضرار الناتجة عن ما قد يحتويه هذا البريد. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #4 from Caolán McNamara --- Yeah, that's the goal. Though we need to add a few little tweaks, e.g. strip anything after ":" off the name of a widget in the .ui, i.e. re "http://opengrok.libreoffice.org/xref/core/basctl/uiconfig/basicide/ui/basicmacrodialog.ui and we don't find libraries, which should raise an error" in that case we have "libraries:border" which is allowed -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 sophie changed: What|Removed |Added Depends on||73544 --- Comment #90 from sophie --- Add bug 73544 update Catalan dictionaries and related resources; ca-ES and ca-ES-valencia locales -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b9/5fa33a4d2827adb8e16de5bae4e535d8c826c9
b9/5fa33a4d2827adb8e16de5bae4e535d8c826c9 |1 + 1 file changed, 1 insertion(+) New commits: commit 225297a39af44988a227ee781d5a04271ea1ddce Author: Caolán McNamara Date: Tue Feb 11 14:34:13 2014 + Notes added by 'git notes add' diff --git a/b9/5fa33a4d2827adb8e16de5bae4e535d8c826c9 b/b9/5fa33a4d2827adb8e16de5bae4e535d8c826c9 new file mode 100644 index 000..58a3758 --- /dev/null +++ b/b9/5fa33a4d2827adb8e16de5bae4e535d8c826c9 @@ -0,0 +1 @@ +merged as: 91f509fda9a04670e0752a214188be87bce1f2ac ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |5 - source/text/shared/01/02230200.xhp | 17 - 2 files changed, 8 insertions(+), 14 deletions(-) New commits: commit b25ad898a35fc268897622a3068179da5f8d819b Author: Caolán McNamara Date: Tue Feb 11 14:14:08 2014 + update help ids for show changes dialog Change-Id: I650a32f7b782ccc1233cfe2a304d475a442c8a3f diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 76ef4f8..b34d859 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5785,9 +5785,6 @@ sc_CheckBox_RID_SCDLG_CHARTCOLROW_1,1494516737, sc_CheckBox_RID_SCDLG_CHARTCOLROW_2,1494516738, sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_LAYOUT_EMPTY,1495401474, sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_SHOW,1495401475, -sc_CheckBox_RID_SCDLG_HIGHLIGHT_CHANGES_CB_HIGHLIGHT,2568963085, -sc_CheckBox_RID_SCDLG_HIGHLIGHT_CHANGES_CB_HIGHLIGHT_ACCEPT,2568963078, -sc_CheckBox_RID_SCDLG_HIGHLIGHT_CHANGES_CB_HIGHLIGHT_REJECT,2568963079, sc_CheckBox_RID_SCDLG_MOVETAB_BTN_COPY,1493451781, sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_CASE,1493746690, sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_REGEXP,1493746691, @@ -5820,7 +5817,6 @@ sc_Edit_RID_SCDLG_DAPISERVICE_ED_USER,1495336975, sc_Edit_RID_SCDLG_DPNUMGROUP_ED_BY,1495418883, sc_Edit_RID_SCDLG_DPNUMGROUP_ED_END,1495418882, sc_Edit_RID_SCDLG_DPNUMGROUP_ED_START,1495418881, -sc_Edit_RID_SCDLG_HIGHLIGHT_CHANGES_ED_ASSIGN,2568964111, sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_INAREA,2567505962, sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_OUTAREA,2567505943, sc_Edit_RID_SCPAGE_CALC_ED_EPS,957253637, @@ -5829,7 +5825,6 @@ sc_Edit_TP_VALIDATION_VALUES_EDT_MIN,548276231, sc_FloatingWindow_RID_SCDLG_TEAM,231304704, sc_ImageButton_FID_FUNCTION_BOX_IMB_INSERT,3651284481, sc_ImageButton_RID_SCDLG_CHANGES_RB_ASSIGN,2568908304, -sc_ImageButton_RID_SCDLG_HIGHLIGHT_CHANGES_RB_ASSIGN,2568973840, sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689, sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_OUTAREA,2567515672, sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289, diff --git a/source/text/shared/01/02230200.xhp b/source/text/shared/01/02230200.xhp index 36fd5a4..7c4dff7 100644 --- a/source/text/shared/01/02230200.xhp +++ b/source/text/shared/01/02230200.xhp @@ -35,9 +35,8 @@ hiding;changes showing; changes - - - + + Show Changes Shows or hides recorded changes. @@ -47,21 +46,21 @@ You can change the display properties of the markup elements by choosing %PRODUCTNAME Writer - Changes in the Options dialog box.%PRODUCTNAME Calc - Changes in the Options dialog box. When you rest the mouse pointer over a change markup in the document, a Tip displays the author and the date and time that the change was made. If the Extended Tips are activated, the type of change and any attached comments are also displayed. - + Show changes in spreadsheet -Shows or hides recorded changes. +Shows or hides recorded changes. - + Show accepted changes -Shows or hides the changes that were accepted. +Shows or hides the changes that were accepted. - + Show rejected changes -Shows or hides the changes that were rejected. +Shows or hides the changes that were rejected. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b2fed833b2815ef0eec42371d994d7882a4b8f40 Author: Caolán McNamara Date: Tue Feb 11 14:14:08 2014 + Updated core Project: help b25ad898a35fc268897622a3068179da5f8d819b diff --git a/helpcontent2 b/helpcontent2 index d331784..b25ad89 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d331784b77abd32c9a2b9de883bb480519b84dfc +Subproject commit b25ad898a35fc268897622a3068179da5f8d819b ___ 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/docnode/nodedump.cxx | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 07c84c123ab1cc65e606812623827fa76103f9c0
Author: Adam Co
Date: Mon Feb 3 18:27:31 2014 +0200
Add XML dumping of the new 'SwExtraRedlineTbl'
Change-Id: Ifeba2d07391258ebf55ff3aa9f604e679cc5d7c9
Reviewed-on: https://gerrit.libreoffice.org/7824
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index 4959207..c15ba59 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -119,6 +119,7 @@ void SwDoc::dumpAsXml( xmlTextWriterPtr w )
mpCharFmtTbl->dumpAsXml( writer );
mpNumRuleTbl->dumpAsXml( writer );
mpRedlineTbl->dumpAsXml( writer );
+mpExtraRedlineTbl->dumpAsXml( writer );
writer.endElement();
}
@@ -592,7 +593,7 @@ void SwRedlineTbl::dumpAsXml( xmlTextWriterPtr w )
else
writer.writeFormatAttribute( "extra_data_type", "%s",
BAD_CAST( "UNKNOWN" ) );
}
-writer.endElement( );// end_swposition
+writer.endElement( );// extra_redline_data
}
writer.endElement( );// extra_redline_data
@@ -615,8 +616,13 @@ void SwExtraRedlineTbl::dumpAsXml( xmlTextWriterPtr w )
const SwExtraRedline* pExtraRedline = extraRedlineTbl.GetRedline(
nCurExtraRedlinePos );
writer.startElement( "swextraredline" );
-writer.writeFormatAttribute( "ptr", "%p", pExtraRedline );
-
+{
+const SwTableRowRedline* pTableRowRedline =
dynamic_cast(pExtraRedline);
+if (pTableRowRedline)
+writer.writeFormatAttribute( "extra_redline_type", "%s",
BAD_CAST( "table row" ) );
+else
+writer.writeFormatAttribute( "extra_redline_type", "%s",
BAD_CAST( "UNKNOWN" ) );
+}
writer.endElement( );// extra_redline_data
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [ANN] sort Gerrit and askbot downtime at ~ 14:00 UTC today
HI *, On Tue, Feb 11, 2014 at 1:50 PM, Christian Lohmaier wrote: > > at around 14:00 UTC today gerrit and askbot will have a short > maintenance downtime and change of IP (temporarily) > > The change of IP might cause delays until you can access the services > at the new, temporary IP, depending how fast your DNS updates. > > gerrit will be reachable at 144.76.139.237 > askbot will be reachable at 144.76.139.238 > > A separate announcement will be sent right before the change happens. Downtime starts in 5minutes. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/IDocumentRedlineAccess.hxx |9 -
sw/inc/doc.hxx|8 +++-
sw/inc/redline.hxx| 19 ++-
sw/source/core/doc/docnew.cxx |3 +
sw/source/core/doc/docredln.cxx | 63 ++
5 files changed, 91 insertions(+), 11 deletions(-)
New commits:
commit d688069023959ab97d14eb1dbfd5bf6ad3c1b160
Author: Adam Co
Date: Mon Feb 3 17:44:22 2014 +0200
Add support for 'Table Row Redlines' in SW core
This patch adds support for 'Table Row Redlines' (such as 'table row
inserted'
or 'table row deleted' in SW core).
This is done by adding a new object called 'SwExtraRedlineTbl' that holds
all
the redlines that are not of type 'SwRangedRedline'.
Also this patch adds a function for adding these types of redlines to the
'SwExtraRedlineTbl' object.
It also further develops the 'SwTableRowRedline' object.
Change-Id: Ic285f33e4f5af8f197d8fc24c2a8a355afad
Reviewed-on: https://gerrit.libreoffice.org/7821
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/inc/IDocumentRedlineAccess.hxx
b/sw/inc/IDocumentRedlineAccess.hxx
index 8125717..144eb4a 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -28,7 +28,9 @@
#include
class SwRangeRedline;
+ class SwTableRowRedline;
class SwRedlineTbl;
+ class SwExtraRedlineTbl;
class SwPaM;
struct SwPosition;
class SwStartNode;
@@ -64,7 +66,9 @@ namespace nsRedlineType_t
const RedlineType_t REDLINE_FORMAT = 0x2;// Attributes have been applied.
const RedlineType_t REDLINE_TABLE = 0x3;// Table structure has been
altered.
const RedlineType_t REDLINE_FMTCOLL = 0x4;// Style has been altered
(Autoformat!).
-const RedlineType_t REDLINE_PARAGRAPH_FORMAT = 0x5;// Paragraph attributes
have been changed
+const RedlineType_t REDLINE_PARAGRAPH_FORMAT = 0x5;// Paragraph attributes
have been changed.
+const RedlineType_t REDLINE_TABLE_ROW_INSERT = 0x6;// Table row has been
inserted.
+const RedlineType_t REDLINE_TABLE_ROW_DELETE = 0x7;// Table row has been
deleted.
// When larger than 128, flags can be inserted.
const RedlineType_t REDLINE_NO_FLAG_MASK = 0x7F;
@@ -126,6 +130,7 @@ public:
virtual bool IsIgnoreRedline() const = 0;
virtual const SwRedlineTbl& GetRedlineTbl() const = 0;
+virtual const SwExtraRedlineTbl& GetExtraRedlineTbl() const = 0;
virtual bool IsInRedlines(const SwNode& rNode) const = 0;
@@ -143,6 +148,8 @@ public:
*/
virtual bool AppendRedline(/*[in]*/SwRangeRedline* pPtr, /*[in]*/bool
bCallDelete) = 0;
+virtual bool AppendTableRowRedline(/*[in]*/SwTableRowRedline* pPtr,
/*[in]*/bool bCallDelete) = 0;
+
virtual bool SplitRedline(/*[in]*/const SwPaM& rPam) = 0;
virtual bool DeleteRedline(
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 2450a81..10159a1 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -144,6 +144,7 @@ class SwPageDesc;
class SwPagePreviewPrtData;
class SwRangeRedline;
class SwRedlineTbl;
+class SwExtraRedlineTbl;
class SwRootFrm;
class SwRubyList;
class SwRubyListEntry;
@@ -356,8 +357,9 @@ class SW_DLLPUBLIC SwDoc :
/// relation between list style and its default list
tHashMapForLists maListStyleLists;
-SwRedlineTbl*mpRedlineTbl; ///< List of all Redlines.
-OUString*mpAutoFmtRedlnComment; ///< Comment for Redlines
inserted via AutoFormat.
+SwRedlineTbl*mpRedlineTbl; ///< List of all Ranged
Redlines.
+SwExtraRedlineTbl *mpExtraRedlineTbl; ///< List of all Extra
Redlines.
+OUString*mpAutoFmtRedlnComment; ///< Comment for Redlines
inserted via AutoFormat.
SwUnoCrsrTbl*mpUnoCrsrTbl;
@@ -767,7 +769,9 @@ public:
virtual bool IsIgnoreRedline() const;
virtual bool IsInRedlines(const SwNode& rNode) const;
virtual const SwRedlineTbl& GetRedlineTbl() const;
+virtual const SwExtraRedlineTbl& GetExtraRedlineTbl() const;
virtual bool AppendRedline(/*[in]*/SwRangeRedline* pPtr, /*[in]*/bool
bCallDelete);
+virtual bool AppendTableRowRedline(/*[in]*/SwTableRowRedline* pPtr,
/*[in]*/bool bCallDelete);
virtual bool SplitRedline(const SwPaM& rPam);
virtual bool DeleteRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool
bSaveInUndo, /*[in]*/sal_uInt16 nDelType);
virtual bool DeleteRedline(/*[in]*/const SwStartNode& rSection,
/*[in]*/bool bSaveInUndo, /*[in]*/sal_uInt16 nDelType);
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 3dc9dea..a4e0a29 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -304,7 +304,7 @@ public:
class SW_DLLPUBLIC SwExtraRedline
{
public:
-SwExtraRedline( RedlineType_t eType );
+SwExtraRedline( );
SwExtraRedline( const SwExtraRedline& );
virtual ~SwExtraRedline();
};
@@ -312,10 +312,25 @@ public:
/// Redline that holds information about a t
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/inc sw/source
sw/inc/expfld.hxx |3 +++
sw/inc/txtfld.hxx |4
sw/source/core/fields/expfld.cxx | 33 +
sw/source/core/fields/usrfld.cxx | 10 --
sw/source/core/txtnode/atrfld.cxx | 24 ++--
5 files changed, 70 insertions(+), 4 deletions(-)
New commits:
commit 3c2b5242e81575ec4b6c110afd88894670bd2283
Author: Oliver-Rainer Wittmann
Date: Tue Feb 11 13:25:08 2014 +
124179: trigger update User Fields and related Input Fields when user
directly edits a User Field Input Field
- assure that no recursive updates occur
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 784f0fb..0b4e14b 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -327,6 +327,9 @@ class SW_DLLPUBLIC SwInputField : public SwField
// Accessing Input Field's content
const String& getContent() const;
+void LockNotifyContentChange();
+void UnlockNotifyContentChange();
+
public:
// Direkte Eingabe ueber Dialog alten Wert loeschen
SwInputField(
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 83ca739..f31dd07 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -86,6 +86,8 @@ public:
virtual xub_StrLen* GetEnd();
+void LockNotifyContentChange();
+void UnlockNotifyContentChange();
virtual void NotifyContentChange( SwFmtFld& rFmtFld );
void UpdateTextNodeContent( const String& rNewContent );
@@ -95,6 +97,8 @@ public:
private:
xub_StrLen m_nEnd;
+
+bool m_bLockNotifyContentChange;
};
#endif
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 6274bd8d..282f920 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -1181,6 +1181,32 @@ const String& SwInputField::getContent() const
return aContent;
}
+
+void SwInputField::LockNotifyContentChange()
+{
+if ( GetFmtFld() != NULL )
+{
+SwTxtInputFld* pTxtInputFld = dynamic_cast< SwTxtInputFld*
>(GetFmtFld()->GetTxtFld());
+if ( pTxtInputFld != NULL )
+{
+pTxtInputFld->LockNotifyContentChange();
+}
+}
+}
+
+
+void SwInputField::UnlockNotifyContentChange()
+{
+if ( GetFmtFld() != NULL )
+{
+SwTxtInputFld* pTxtInputFld = dynamic_cast< SwTxtInputFld*
>(GetFmtFld()->GetTxtFld());
+if ( pTxtInputFld != NULL )
+{
+pTxtInputFld->UnlockNotifyContentChange();
+}
+}
+}
+
void SwInputField::applyFieldContent( const String& rNewFieldContent )
{
if ( (nSubType & 0x00ff) == INP_TXT )
@@ -1194,6 +1220,13 @@ void SwInputField::applyFieldContent( const String&
rNewFieldContent )
if( pUserTyp )
{
pUserTyp->SetContent( rNewFieldContent );
+
+// trigger update of the corresponding User Fields and other
related Input Fields
+{
+LockNotifyContentChange();
+pUserTyp->UpdateFlds();
+UnlockNotifyContentChange();
+}
}
}
}
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index e6491db..0ea4417 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -234,8 +234,14 @@ void SwUserFieldType::Modify( const SfxPoolItem* pOld,
const SfxPoolItem* pNew )
ChgValid( sal_False );
NotifyClients( pOld, pNew );
-// und ggfs. am UserFeld haengende InputFelder updaten!
-GetDoc()->GetSysFldType( RES_INPUTFLD )->UpdateFlds();
+
+// update Input Fields as there might be Input Fields depending on this
User Field
+if ( !IsModifyLocked() )
+{
+LockModify();
+GetDoc()->GetSysFldType( RES_INPUTFLD )->UpdateFlds();
+UnlockModify();
+}
}
double SwUserFieldType::GetValue( SwCalc& rCalc )
diff --git a/sw/source/core/txtnode/atrfld.cxx
b/sw/source/core/txtnode/atrfld.cxx
index c93733f..90526b0 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -457,6 +457,7 @@ SwTxtInputFld::SwTxtInputFld(
: SwTxtFld( rAttr, nStart )
, m_nEnd( nEnd )
+, m_bLockNotifyContentChange( false )
{
SetHasDummyChar( false );
SetHasContent( true );
@@ -477,11 +478,30 @@ xub_StrLen* SwTxtInputFld::GetEnd()
return &m_nEnd;
}
+
+void SwTxtInputFld::LockNotifyContentChange()
+{
+m_bLockNotifyContentChange = true;
+}
+
+
+void SwTxtInputFld::UnlockNotifyContentChange()
+{
+m_bLockNotifyContentChange = false;
+}
+
+
void SwTxtInputFld::NotifyContentChange( SwFmtFld& rFmtFld )
{
-SwTxtFld::NotifyContentChange( rFmtFld );
+if ( !m_bLockNotifyContentChange )
+{
+LockNotifyContentChange();
+
+SwTxtFld::NotifyContentChange( rFmtFld );
+UpdateTextNodeContent( GetFieldContent() );
-UpdateTextNodeContent( GetFieldContent() );
+UnlockNotifyContentChange();
+}
}
const String SwTxtInputFld::Get
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 6cab3069caf9fd5c1ce938d2891e14e6eec7850b
Author: Adam Co
Date: Mon Feb 3 17:11:00 2014 +0200
Nit-pick: Added a 'default' clause for a switch-case
Change-Id: I241d7cc1cc530b8d3fae7fd7bd185285e16e3b5b
Reviewed-on: https://gerrit.libreoffice.org/7819
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 26a7384..deb4fdd 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1516,6 +1516,8 @@ void DomainMapper_Impl::CreateRedline( uno::Reference<
text::XTextRange > xRange
case ooxml::OOXML_ParagraphFormat:
sType = rPropNameSupplier.GetName( PROP_PARAGRAPH_FORMAT );
break;
+default:
+throw
::com::sun::star::lang::IllegalArgumentException("illegal redline token type",
NULL, 0);
}
uno::Reference < text::XRedline > xRedline( xRange,
uno::UNO_QUERY_THROW );
beans::PropertyValues aRedlineProperties( 3 );
___
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/text/txtfrm.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f12b902d976096b7e2933fddf74e0f4987e35c6c
Author: Stephan Bergmann
Date: Tue Feb 11 14:53:44 2014 +0100
Fix the -Werror=strict-overflow correctly
...from 2bf2dee04c1d698e586316c2bd18a3e34df4be77 "Werror=strict-overflow."
The
warning (generated e.g. by --disable-debug --disable-dbgutil builds with
GCC 4.8.2) orginates from the call to
InvalidateRange( SwCharRange( GetOfst(), COMPLETE_STRING ) );
in SwTxtFrm::Prepare further down in txtfrm.cxx, which inlines the
IsIdxInside
code to
if( GetOfst() > GetOfst() + COMPLETE_STRING )
where COMPLETE_STRING is SAL_MAX_INT32. The problem is that before
ba27366f3d6bc6b209ecd5c5cb79a9ee5315316a "Resolves: #i17171# Writer
paragraph
cannot be longer than 65534 characters" that code would inline to
if( GetOfst() > GetOfst() + STRING_LEN )
where STRING_LEN was 0x, so the calculation on effectively 16-bit
quantities
stayed nicely in the bounds of (32-bit) int.
Change-Id: I958514e52e9102236844eefa4fe92a401be6ab01
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 9a2aa38..12124a7 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -673,7 +673,7 @@ sal_Int32 SwTxtFrm::FindBrk( const OUString &rTxt,
sal_Bool SwTxtFrm::IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen )
const
{
-if( nPos + nLen < 0 || GetOfst() > nPos + nLen ) // the range preceded us
+if( nLen != COMPLETE_STRING && GetOfst() > nPos + nLen ) // the range
preceded us
return sal_False;
if( !GetFollow() )// the range doesn't precede us,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/inc writerfilter/source
writerfilter/inc/dmapper/DomainMapper.hxx|2
writerfilter/source/dmapper/DomainMapper.cxx | 57 +--
2 files changed, 39 insertions(+), 20 deletions(-)
New commits:
commit af84f04c10724fdeecfc25de46fa1d54cf905bd2
Author: Adam Co
Date: Mon Feb 3 14:13:37 2014 +0200
Refactor some code for handling redline in DOCX importer
Change-Id: Id5d0814c1ebbcd85507d11cf562d394a748773a6
Reviewed-on: https://gerrit.libreoffice.org/7807
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx
b/writerfilter/inc/dmapper/DomainMapper.hxx
index f7d6fcb..ce30d69 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -129,6 +129,8 @@ public:
uno::Sequence GetThemeFontLangProperties() const;
+void HandleRedline( Sprm& rSprm );
+
private:
// Stream
virtual void lcl_startSectionGroup();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index bd8e6fd..5751e33 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2224,26 +2224,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
case NS_ooxml::LN_trackchange:
case NS_ooxml::LN_EG_RPrContent_rPrChange:
{
-m_pImpl->AddNewRedline( );
-
-if (nSprmId == NS_ooxml::LN_CT_PPr_pPrChange)
-{
-m_pImpl->SetCurrentRedlineToken( ooxml::OOXML_ParagraphFormat );
-}
-
-resolveSprmProps(*this, rSprm );
-// now the properties author, date and id should be available
-sal_Int32 nToken = m_pImpl->GetCurrentRedlineToken();
-switch( nToken & 0x )
-{
-case ooxml::OOXML_mod :
-case ooxml::OOXML_ins :
-case ooxml::OOXML_del :
-case ooxml::OOXML_ParagraphFormat :
-break;
-default: OSL_FAIL( "redline token other than mod, ins or del" );
-}
-m_pImpl->EndParaMarkerChange( );
+HandleRedline( rSprm );
}
break;
case NS_ooxml::LN_endtrackchange:
@@ -3190,6 +3171,42 @@ uno::Sequence
DomainMapper::GetThemeFontLangProperties() c
return m_pImpl->GetSettingsTable()->GetThemeFontLangProperties();
}
+void DomainMapper::HandleRedline( Sprm& rSprm )
+{
+sal_uInt32 nSprmId = rSprm.getId();
+
+m_pImpl->AddNewRedline( );
+
+if (nSprmId == NS_ooxml::LN_CT_PPr_pPrChange)
+{
+m_pImpl->SetCurrentRedlineToken( ooxml::OOXML_ParagraphFormat );
+}
+else if (nSprmId == NS_ooxml::LN_CT_TrPr_ins)
+{
+m_pImpl->SetCurrentRedlineToken( ooxml::OOXML_tableRowInsert );
+}
+else if (nSprmId == NS_ooxml::LN_CT_TrPr_del)
+{
+m_pImpl->SetCurrentRedlineToken( ooxml::OOXML_tableRowDelete );
+}
+
+resolveSprmProps(*this, rSprm );
+// now the properties author, date and id should be available
+sal_Int32 nToken = m_pImpl->GetCurrentRedlineToken();
+switch( nToken & 0x )
+{
+case ooxml::OOXML_mod :
+case ooxml::OOXML_ins :
+case ooxml::OOXML_del :
+case ooxml::OOXML_ParagraphFormat :
+case ooxml::OOXML_tableRowInsert:
+case ooxml::OOXML_tableRowDelete:
+break;
+default: OSL_FAIL( "redline token other than mod, ins, del or table
row" ); break;
+}
+m_pImpl->EndParaMarkerChange( );
+}
+
} //namespace dmapper
} //namespace writerfilter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk|1
writerfilter/source/dmapper/TrackChangesHandler.cxx | 100
writerfilter/source/dmapper/TrackChangesHandler.hxx | 48 +
3 files changed, 149 insertions(+)
New commits:
commit 88fbcba044878173f2458eede798f03de25f9cb9
Author: Adam Co
Date: Mon Feb 3 13:03:42 2014 +0200
Add 'Track Changes Handler' for 'Extra' redlines
This handler will process 'track changes' information for 'extra' redline
objects (such as 'table row insert\delete' redlines)
Reviewed on:
https://gerrit.libreoffice.org/7802
Change-Id: I8dd0bd70dbdcb3cb7eae76595957817de08c66fc
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index 71d798e..e57f0b6 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -107,6 +107,7 @@ $(eval $(call
gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/dmapper/GraphicImport \
writerfilter/source/dmapper/LatentStyleHandler \
writerfilter/source/dmapper/MeasureHandler \
+writerfilter/source/dmapper/TrackChangesHandler \
writerfilter/source/dmapper/ModelEventListener \
writerfilter/source/dmapper/NumberingManager \
writerfilter/source/dmapper/OLEHandler \
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.cxx
b/writerfilter/source/dmapper/TrackChangesHandler.cxx
new file mode 100644
index 000..d34dca3
--- /dev/null
+++ b/writerfilter/source/dmapper/TrackChangesHandler.cxx
@@ -0,0 +1,100 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#include
+#include
+#include
+#include
+#include
+#include "dmapperLoggers.hxx"
+
+namespace writerfilter {
+namespace dmapper {
+
+using namespace ::com::sun::star;
+
+
+TrackChangesHandler::TrackChangesHandler( sal_Int32 nToken ) :
+LoggedProperties(dmapper_logger, "TrackChangesHandler")
+{
+m_pRedlineParams = RedlineParamsPtr( new RedlineParams() );
+m_pRedlineParams->m_nToken = nToken;
+}
+
+
+TrackChangesHandler::~TrackChangesHandler()
+{
+}
+
+
+void TrackChangesHandler::lcl_attribute(Id rName, Value & rVal)
+{
+sal_Int32 nIntValue = rVal.getInt();
+OUString sStringValue = rVal.getString();
+(void)rName;
+switch( rName )
+{
+case NS_ooxml::LN_CT_TrackChange_author:
+{
+m_pRedlineParams->m_sAuthor = sStringValue;
+}
+break;
+case NS_ooxml::LN_CT_TrackChange_date:
+{
+m_pRedlineParams->m_sDate = sStringValue;
+}
+break;
+case NS_ooxml::LN_CT_Markup_id:
+{
+m_pRedlineParams->m_nId = nIntValue;
+}
+break;
+default:
+OSL_FAIL( "unknown attribute");
+}
+}
+
+uno::Sequence
TrackChangesHandler::getRedlineProperties() const
+{
+uno::Sequence< beans::PropertyValue > aRedlineProperties(3);
+beans::PropertyValue* pRedlineProperties = aRedlineProperties.getArray();
+
+PropertyNameSupplier& rPropNameSupplier =
PropertyNameSupplier::GetPropertyNameSupplier();
+
+OUString sType;
+switch ( m_pRedlineParams->m_nToken & 0x )
+{
+case ooxml::OOXML_tableRowInsert:
+sType = rPropNameSupplier.GetName( PROP_TABLE_ROW_INSERT );
+break;
+case ooxml::OOXML_tableRowDelete:
+sType = rPropNameSupplier.GetName( PROP_TABLE_ROW_DELETE );
+break;
+}
+
+pRedlineProperties[0].Name = rPropNameSupplier.GetName( PROP_REDLINE_TYPE
);
+pRedlineProperties[0].Value <<= sType;
+pRedlineProperties[1].Name = rPropNameSupplier.GetName(
PROP_REDLINE_AUTHOR );
+pRedlineProperties[1].Value <<= m_pRedlineParams->m_sAuthor;
+pRedlineProperties[2].Name = rPropNameSupplier.GetName(
PROP_REDLINE_DATE_TIME );
+pRedlineProperties[2].Value <<=
ConversionHelper::ConvertDateStringToDateTime( m_pRedlineParams->m_sDate );
+//pRedlineProperties[3].Name = rPropNameSupplier.GetName(
PROP_REDLINE_REVERT_PROPERTIES );
+//pRedlineProperties[3].Value <<= pRedline->m_aRevertProperties;
+
+return aRedlineProperties;
+}
+
+void TrackChangesHandler::lcl_sprm(Sprm & rSprm)
+{
+(void)rSprm;
+}
+
+} //namespace dmapper
+} //namespace writerfilter
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx
b/writerfilter/source/dmapper/TrackChangesHandler.hxx
new file mode 100644
index 000..4f1e34c
--- /dev/null
+++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx
@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 90/98e3da831f24cd384f5bc70c42310792bb3bde
90/98e3da831f24cd384f5bc70c42310792bb3bde |1 + 1 file changed, 1 insertion(+) New commits: commit 4d197d695c468355fc4f2fa3fcfaaf8bf7d01be3 Author: Caolán McNamara Date: Tue Feb 11 13:40:57 2014 + Notes added by 'git notes add' diff --git a/90/98e3da831f24cd384f5bc70c42310792bb3bde b/90/98e3da831f24cd384f5bc70c42310792bb3bde new file mode 100644 index 000..59aa1d2 --- /dev/null +++ b/90/98e3da831f24cd384f5bc70c42310792bb3bde @@ -0,0 +1 @@ +prefer: d33b4c311e3b9c0b8f50080cb38a31c19f587a16 ___ 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/ConversionHelper.cxx | 26 +-
writerfilter/source/dmapper/ConversionHelper.hxx |1
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 31 +-
3 files changed, 28 insertions(+), 30 deletions(-)
New commits:
commit 94429caa64a1dca701f0b120f669bdd561b6ced9
Author: Adam Co
Date: Mon Feb 3 16:53:17 2014 +0200
Refactor the code for converting 'Date' string to 'DateTime'
Change-Id: I20632258709856cd4c6680e1c8a1d92271ad0453
Reviewed-on: https://gerrit.libreoffice.org/7817
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx
b/writerfilter/source/dmapper/ConversionHelper.cxx
index 102e5c8..c39859d 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -254,7 +254,6 @@ sal_Int32 ConvertColor(sal_Int32 nWordColor)
return nRet;
}
-
sal_Int16 convertTableJustification( sal_Int32 nIntValue )
{
sal_Int16 nOrient = text::HoriOrientation::LEFT_AND_WIDTH;
@@ -412,6 +411,31 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt)
return nRet;
}
+com::sun::star::util::DateTime ConvertDateStringToDateTime( const OUString&
rDateTime )
+{
+com::sun::star::util::DateTime aDateTime;
+//xsd::DateTime in the format [-]CCYY-MM-DDThh:mm:ss[Z|(+|-)hh:mm]
example: 2008-01-21T10:42:00Z
+//OUString getToken( sal_Int32 token, sal_Unicode cTok, sal_Int32& index )
const SAL_THROW(())
+sal_Int32 nIndex = 0;
+OUString sDate = rDateTime.getToken( 0, 'T', nIndex );
+// HACK: this is broken according to the spec, but MSOffice always treats
the time as local,
+// and writes it as Z (=UTC+0)
+OUString sTime = rDateTime.getToken( 0, 'Z', nIndex );
+nIndex = 0;
+aDateTime.Year = sal_uInt16( sDate.getToken( 0, '-', nIndex ).toInt32() );
+aDateTime.Month = sal_uInt16( sDate.getToken( 0, '-', nIndex ).toInt32() );
+if (nIndex != -1)
+aDateTime.Day = sal_uInt16( sDate.copy( nIndex ).toInt32() );
+
+nIndex = 0;
+aDateTime.Hours = sal_uInt16( sTime.getToken( 0, ':', nIndex ).toInt32() );
+aDateTime.Minutes = sal_uInt16( sTime.getToken( 0, ':', nIndex ).toInt32()
);
+if (nIndex != -1)
+aDateTime.Seconds = sal_uInt16( sTime.copy( nIndex ).toInt32() );
+
+return aDateTime;
+}
+
} // namespace ConversionHelper
} //namespace dmapper
diff --git a/writerfilter/source/dmapper/ConversionHelper.hxx
b/writerfilter/source/dmapper/ConversionHelper.hxx
index 352d29f..ff2fa7f 100644
--- a/writerfilter/source/dmapper/ConversionHelper.hxx
+++ b/writerfilter/source/dmapper/ConversionHelper.hxx
@@ -50,6 +50,7 @@ namespace ConversionHelper{
sal_Int16 convertTableJustification( sal_Int32 nIntValue );
sal_Int16 ConvertNumberingType(sal_Int32 nFmt);
+com::sun::star::util::DateTime ConvertDateStringToDateTime( const
OUString& rDateTime );
} // namespace ConversionHelper
} //namespace dmapper
} // namespace writerfilter
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 12855fe..26a7384 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1104,32 +1104,6 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr
pPropertyMap )
#endif
}
-
-util::DateTime lcl_DateStringToDateTime( const OUString& rDateTime )
-{
-util::DateTime aDateTime;
-//xsd::DateTime in the format [-]CCYY-MM-DDThh:mm:ss[Z|(+|-)hh:mm]
example: 2008-01-21T10:42:00Z
-//OUString getToken( sal_Int32 token, sal_Unicode cTok, sal_Int32& index )
const SAL_THROW(())
-sal_Int32 nIndex = 0;
-OUString sDate = rDateTime.getToken( 0, 'T', nIndex );
-// HACK: this is broken according to the spec, but MSOffice always treats
the time as local,
-// and writes it as Z (=UTC+0)
-OUString sTime = rDateTime.getToken( 0, 'Z', nIndex );
-nIndex = 0;
-aDateTime.Year = sal_uInt16( sDate.getToken( 0, '-', nIndex ).toInt32() );
-aDateTime.Month = sal_uInt16( sDate.getToken( 0, '-', nIndex ).toInt32() );
-if (nIndex != -1)
-aDateTime.Day = sal_uInt16( sDate.copy( nIndex ).toInt32() );
-
-nIndex = 0;
-aDateTime.Hours = sal_uInt16( sTime.getToken( 0, ':', nIndex ).toInt32() );
-aDateTime.Minutes = sal_uInt16( sTime.getToken( 0, ':', nIndex ).toInt32()
);
-if (nIndex != -1)
-aDateTime.Seconds = sal_uInt16( sTime.copy( nIndex ).toInt32() );
-
-return aDateTime;
-}
-
void DomainMapper_Impl::appendTextPortion( const OUString& rString,
PropertyMapPtr pPropertyMap )
{
if (m_bDiscardHeaderFooter)
@@ -1549,10 +1523,9 @@ void DomainMapper_Impl::CreateRedline( uno::Reference<
text::XTextRange > xRange
pRedlineProperties[0].Name = rPropNameSupplier.GetName(
PROP_REDLINE_AUTHOR );
pRedlineProperties[0].Value <<= pRedline->m_sAuthor;
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx |8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 4cf524e07e1b0355b418c19eae0dbf8771fb12be
Author: Stephan Bergmann
Date: Tue Feb 11 14:10:43 2014 +0100
Related fdo#74597: Java on Mac doesn't use javaldx/library path fiddling
...so no need to return non-empty SunInfo::getLibraryPaths (for the Oracle
JRE,
cf. how this had always returned an empty set for the Apple JRE in
otherjre.cxx).
This fixes the bug that selecting the Oracle JRE in the Advanced options
pane
didn't stick, because jfw_areEqualJavaInfo was called on a JavaInfo read
back
from XML where nRequirements had been cleared (in
CNodeJavaInfo::loadFromNode)
and a JavaInfo where non-empty SunInfo::getLibraryPaths ->
VendorBase::needsRestart() == true -> nRequirements ==
JFW_REQUIRE_NEEDRESTART,
so always returned false.
(There's multiple errors here. It is questionable whether
jfw_areEqualJavaInfo
should take nRequirements into account, at least when used from
SvxJavaOptionsPage. And VendorBase::getLibraryPaths appears to be only
used to
compute VendorBase::needsRestart, ignoring the actual path data. But leave
that
for future clean-up.)
Change-Id: I5f004434b1cb7e909a153c43c474a2317f24b0c1
(cherry picked from commit 6c697a99c90a40492eb8c16466a2082cc2be927e)
Reviewed-on: https://gerrit.libreoffice.org/7997
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 180bbb9..e38ecf8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -76,18 +76,12 @@ char const* const* SunInfo::getRuntimePaths(int * size)
char const* const* SunInfo::getLibraryPaths(int* size)
{
-#if defined UNX
+#if defined UNX && !defined MACOSX
static char const * ar[] = {
-#if defined MACOSX && defined X86_64
-// Oracle Java 7, under /Library/Internet
Plug-Ins/JavaAppletPlugin.plugin/Contents/Home
-"/lib/server",
-"/lib"
-#else
"/lib/" JFW_PLUGIN_ARCH "/client",
"/lib/" JFW_PLUGIN_ARCH "/server",
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
"/lib/" JFW_PLUGIN_ARCH
-#endif
};
*size = SAL_N_ELEMENTS(ar);
return ar;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/ui/miscdlgs/highred.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 2e2040401d99fe116b65b9661c3d4755091a6604
Author: Caolán McNamara
Date: Tue Feb 11 11:55:18 2014 +
edit->changes->show has empty filter settings
Change-Id: I98999c0f402cf84d89b3a1167480dc27fdbc2be9
(cherry picked from commit 55c413b9cb2692b784c6c43a519be08146438237)
Reviewed-on: https://gerrit.libreoffice.org/7995
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/sc/source/ui/miscdlgs/highred.cxx
b/sc/source/ui/miscdlgs/highred.cxx
index d863bdd..e4b46e8 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -63,6 +63,10 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB,
SfxChildWindow* pCW, Wind
{
FreeResource();
+aFilterCtr.HideRange(false);
+Size aCtrSize(LogicToPixel(Size(261 , 86), MAP_APPFONT));
+aFilterCtr.SetSizePixel(aCtrSize);
+
Point aFlFilterPt( aFlFilter.GetPosPixel() );
aFlFilterPt.Y() += aFlFilter.GetSizePixel().Height();
aFilterCtr.SetPosPixel( aFlFilterPt );
@@ -72,7 +76,6 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB,
SfxChildWindow* pCW, Wind
aOkButton.SetClickHdl(LINK( this, ScHighlightChgDlg, OKBtnHdl));
aHighlightBox.SetClickHdl(LINK( this, ScHighlightChgDlg, HighLightHandle
));
aFilterCtr.SetRefHdl(LINK( this, ScHighlightChgDlg, RefHandle ));
-aFilterCtr.HideRange(false);
aFilterCtr.Show();
SetDispatcherLock( true );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/miscdlgs/highred.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 56b6a745fa410f7cdfdd9ee47786a3edd6780ba7
Author: Caolán McNamara
Date: Tue Feb 11 11:55:18 2014 +
edit->changes->show has empty filter settings
Change-Id: I98999c0f402cf84d89b3a1167480dc27fdbc2be9
(cherry picked from commit 55c413b9cb2692b784c6c43a519be08146438237)
Reviewed-on: https://gerrit.libreoffice.org/7994
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/sc/source/ui/miscdlgs/highred.cxx
b/sc/source/ui/miscdlgs/highred.cxx
index cec568e..4c07106 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -63,6 +63,10 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB,
SfxChildWindow* pCW, Wind
{
FreeResource();
+aFilterCtr.HideRange(false);
+Size aCtrSize(LogicToPixel(Size(261 , 86), MAP_APPFONT));
+aFilterCtr.SetSizePixel(aCtrSize);
+
Point aFlFilterPt( aFlFilter.GetPosPixel() );
aFlFilterPt.Y() += aFlFilter.GetSizePixel().Height();
aFilterCtr.SetPosPixel( aFlFilterPt );
@@ -72,7 +76,6 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB,
SfxChildWindow* pCW, Wind
aOkButton.SetClickHdl(LINK( this, ScHighlightChgDlg, OKBtnHdl));
aHighlightBox.SetClickHdl(LINK( this, ScHighlightChgDlg, HighlightHandle
));
aFilterCtr.SetRefHdl(LINK( this, ScHighlightChgDlg, RefHandle ));
-aFilterCtr.HideRange(false);
aFilterCtr.Show();
SetDispatcherLock( true );
___
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/PropertyIds.cxx |8 writerfilter/source/dmapper/PropertyIds.hxx |8 2 files changed, 16 insertions(+) New commits: commit 25e6760c34f6df45fb60a756af503d6525c46f61 Author: Adam Co Date: Mon Feb 3 17:08:55 2014 +0200 Add some property IDs in the DOCX importer (for future table redline patch) Change-Id: Id9d7e6903d6cd36f04c96fb509da1508d493cef8 Reviewed-on: https://gerrit.libreoffice.org/7818 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx index 004ff56..e2ad140 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -153,6 +153,8 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) const case PROP_TOP_BORDER:sName = "TopBorder";break; case PROP_BOTTOM_BORDER :sName = "BottomBorder";break; case PROP_TABLE_BORDER :sName = "TableBorder";break; +case PROP_TABLE_ROW_DELETE :sName = "TableRowDelete"; break; +case PROP_TABLE_ROW_INSERT :sName = "TableRowInsert"; break; case PROP_LEFT_BORDER_DISTANCE :sName = "LeftBorderDistance"; break; case PROP_RIGHT_BORDER_DISTANCE :sName = "RightBorderDistance"; break; case PROP_TOP_BORDER_DISTANCE :sName = "TopBorderDistance";break; @@ -270,10 +272,16 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) const case PROP_SIZE_TYPE :sName = "SizeType"; break; case PROP_TABLE_COLUMN_SEPARATORS: sName = "TableColumnSeparators"; break; case META_PROP_TABLE_STYLE_NAME :sName = "TableStyleName"; break; +case PROP_TABLE_REDLINE_PARAMS :sName = "TableRedlineParams"; break; +case PROP_TABLE_REDLINE_AUTHOR :sName = "TableRedlineAuthor"; break; +case PROP_TABLE_REDLINE_DATE:sName = "TableRedlineDate"; break; +case PROP_TABLE_REDLINE_ID :sName = "TableRedlineID"; break; +case PROP_TABLE_REDLINE_TOKEN :sName = "TableRedlineToken"; break; case PROP_REDLINE_AUTHOR:sName = "RedlineAuthor"; break; case PROP_REDLINE_DATE_TIME :sName = "RedlineDateTime"; break; case PROP_REDLINE_COMMENT :sName = "RedlineComment"; break; case PROP_REDLINE_TYPE :sName = "RedlineType"; break; +case PROP_REDLINE_TOKEN :sName = "RedlineToken"; break; case PROP_REDLINE_REVERT_PROPERTIES: sName = "RedlineRevertProperties"; break; case PROP_REDLINE_SUCCESSOR_DATA:sName = "RedlineSuccessorData"; break; case PROP_REDLINE_IDENTIFIER:sName = "RedlineIdentifier"; break; diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx index f90f7df..d60e48d 100644 --- a/writerfilter/source/dmapper/PropertyIds.hxx +++ b/writerfilter/source/dmapper/PropertyIds.hxx @@ -244,6 +244,7 @@ enum PropertyIds ,PROP_REDLINE_IDENTIFIER ,PROP_REDLINE_SUCCESSOR_DATA ,PROP_REDLINE_TYPE +,PROP_REDLINE_TOKEN ,PROP_REDLINE_REVERT_PROPERTIES ,PROP_REFERENCE_FIELD_PART ,PROP_REFERENCE_FIELD_SOURCE @@ -272,6 +273,13 @@ enum PropertyIds ,PROP_TABLE_BORDER ,PROP_TABLE_BORDER_DISTANCES ,PROP_TABLE_COLUMN_SEPARATORS +,PROP_TABLE_REDLINE_PARAMS +,PROP_TABLE_REDLINE_AUTHOR +,PROP_TABLE_REDLINE_DATE +,PROP_TABLE_REDLINE_ID +,PROP_TABLE_REDLINE_TOKEN +,PROP_TABLE_ROW_DELETE +,PROP_TABLE_ROW_INSERT ,PROP_TABS_RELATIVE_TO_INDENT ,PROP_TAB_STOP_DISTANCE ,PROP_TEXT ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc
sw/inc/docary.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fef4a0f3d4216d77a8a3ce271ce0b0b878d965d6
Author: Stephan Bergmann
Date: Tue Feb 11 14:26:30 2014 +0100
loplugin:implicitboolconversion
Change-Id: I1b8cf992b574fe6155701711a619bad5bfc34265
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index ed78fd2..01cf946 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -204,7 +204,7 @@ public:
sal_uInt16 GetSize() const { return
m_aExtraRedlines.size();}
SwExtraRedline* GetRedline( sal_uInt16 uIndex ) const { return
m_aExtraRedlines.operator[]( uIndex ); }
-sal_uInt16 IsEmpty() const { return
m_aExtraRedlines.empty(); }
+bool IsEmpty() const { return
m_aExtraRedlines.empty(); }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b1add8f4acc231875d08e3edcf318865f2630e78
Author: Matúš Kukan
Date: Tue Feb 11 14:18:10 2014 +0100
native code generator: components tweaking
We should survive without deployment_component_getFactory,
although Android build may need some changes.
ContextChangeEventMultiplexer seems to be useful.
Change-Id: I20544429425675449ad0471190968c5bfb97bbf9
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 965afe5..3f1a0c1 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -22,7 +22,6 @@ core_factory_list = [
("libstocserviceslo.a", "stocservices_component_getFactory"),
("libcomphelper.a", "comphelp_component_getFactory"),
("libconfigmgrlo.a", "configmgr_component_getFactory"),
-("libdeployment.a", "deployment_component_getFactory"),
("libfilterconfiglo.a", "filterconfig1_component_getFactory"),
("libfsstoragelo.a", "fsstorage_component_getFactory"),
("libfwklo.a", "fwk_component_getFactory"),
@@ -64,6 +63,7 @@ core_constructor_list = [
"com_sun_star_comp_framework_UIElementFactoryManager_get_implementation",
"com_sun_star_comp_framework_URLTransformer_get_implementation",
"com_sun_star_comp_framework_WindowStateConfiguration_get_implementation",
+
"org_apache_openoffice_comp_framework_ContextChangeEventMultiplexer_get_implementation",
# i18npool/util/i18npool.component
"com_sun_star_i18n_BreakIterator_get_implementation",
"com_sun_star_i18n_BreakIterator_Unicode_get_implementation",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx |8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 6c697a99c90a40492eb8c16466a2082cc2be927e
Author: Stephan Bergmann
Date: Tue Feb 11 14:10:43 2014 +0100
Related fdo#74597: Java on Mac doesn't use javaldx/library path fiddling
...so no need to return non-empty SunInfo::getLibraryPaths (for the Oracle
JRE,
cf. how this had always returned an empty set for the Apple JRE in
otherjre.cxx).
This fixes the bug that selecting the Oracle JRE in the Advanced options
pane
didn't stick, because jfw_areEqualJavaInfo was called on a JavaInfo read
back
from XML where nRequirements had been cleared (in
CNodeJavaInfo::loadFromNode)
and a JavaInfo where non-empty SunInfo::getLibraryPaths ->
VendorBase::needsRestart() == true -> nRequirements ==
JFW_REQUIRE_NEEDRESTART,
so always returned false.
(There's multiple errors here. It is questionable whether
jfw_areEqualJavaInfo
should take nRequirements into account, at least when used from
SvxJavaOptionsPage. And VendorBase::getLibraryPaths appears to be only
used to
compute VendorBase::needsRestart, ignoring the actual path data. But leave
that
for future clean-up.)
Change-Id: I5f004434b1cb7e909a153c43c474a2317f24b0c1
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 180bbb9..e38ecf8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -76,18 +76,12 @@ char const* const* SunInfo::getRuntimePaths(int * size)
char const* const* SunInfo::getLibraryPaths(int* size)
{
-#if defined UNX
+#if defined UNX && !defined MACOSX
static char const * ar[] = {
-#if defined MACOSX && defined X86_64
-// Oracle Java 7, under /Library/Internet
Plug-Ins/JavaAppletPlugin.plugin/Contents/Home
-"/lib/server",
-"/lib"
-#else
"/lib/" JFW_PLUGIN_ARCH "/client",
"/lib/" JFW_PLUGIN_ARCH "/server",
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
"/lib/" JFW_PLUGIN_ARCH
-#endif
};
*size = SAL_N_ELEMENTS(ar);
return ar;
___
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/ui/dbui/dbmgr.cxx | 32 ++--
1 file changed, 14 insertions(+), 18 deletions(-)
New commits:
commit 8d11531565d746dd6a7938c4f3536ad34698092d
Author: Jan-Marek Glogowski
Date: Thu Dec 26 23:15:24 2013 +0100
Copy mail merge source instead of loading
Currently a mail merge loads the styles from the source document
and also loads the original source per mail merge dataset.
The new code is based on the MergeDocuments function and swaps the
loading with an internal document copy to improve mail merge
throughtput.
For a mail merge with 99 datasets and a two pages document,
callgrind shows an improvement from routhly 44 to 31 billion
inclusive instructions for the single SwXMailMerge::execute call.
Change-Id: I6929ba371f81c3ea1f26ea3a25e7751bc53256e3
Reviewed-on: https://gerrit.libreoffice.org/7433
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index e9e0319..63d70d1 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -869,11 +869,8 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell*
pSourceShell,
pSfxDispatcher->Execute( pSourceDocSh->HasName() ? SID_SAVEDOC :
SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD);
if( !pSourceDocSh->IsModified() )
{
-SfxMedium* pOrig = pSourceDocSh->GetMedium();
-OUString sSourceDocumentURL(pOrig->GetURLObject().GetMainURL(
INetURLObject::NO_DECODE ));
-const SfxFilter* pSfxFlt = SwIoSystem::GetFileFilter(
-sSourceDocumentURL,
::aEmptyOUStr );
-const SfxFilter* pStoreToFilter = pSfxFlt;
+const SfxFilter* pStoreToFilter = SwIoSystem::GetFileFilter(
+pSourceDocSh->GetMedium()->GetURLObject().GetMainURL(
INetURLObject::NO_DECODE ), ::aEmptyOUStr );
SfxFilterContainer* pFilterContainer =
SwDocShell::Factory().GetFilterContainer();
const OUString* pStoreToFilterOptions = 0;
@@ -922,14 +919,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell*
pSourceShell,
pTargetView->AttrChangedNotify( &pTargetView->GetWrtShell() );
pTargetShell = pTargetView->GetWrtShellPtr();
//copy the styles from the source to the target document
-SwgReaderOption aOpt;
-aOpt.SetTxtFmts( sal_True );
-aOpt.SetFrmFmts( sal_True );
-aOpt.SetPageDescs( sal_True );
-aOpt.SetNumRules( sal_True );
-aOpt.SetMerge( sal_False );
-pTargetView->GetDocShell()->LoadStylesFromFile(
-sSourceDocumentURL, aOpt, sal_True );
+pTargetView->GetDocShell()->_LoadStyles( *pSourceDocSh,
sal_True );
//determine the page style and number used at the start of the
source document
pSourceShell->SttEndDoc(sal_True);
nStartingPageNo = pSourceShell->GetVirtPageNum();
@@ -1026,13 +1016,19 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell*
pSourceShell,
for (sal_uInt16 i = 0; i < 25; i++)
Application::Reschedule();
-// Create and save new document
// The SfxObjectShell will be closed explicitly later
but it is more safe to use SfxObjectShellLock here
-SfxObjectShellLock xWorkDocSh( new SwDocShell(
SFX_CREATE_MODE_INTERNAL ));
-SfxMedium* pWorkMed = new SfxMedium(
sSourceDocumentURL, STREAM_STD_READ );
-pWorkMed->SetFilter( pSfxFlt );
+SfxObjectShellLock xWorkDocSh;
+// copy the source document
+if( 1 == nDocNo && (bAsSingleFile ||
rMergeDescriptor.bCreateSingleFile) )
+{
+uno::Reference< util::XCloneable > xClone(
pSourceDocSh->GetModel(), uno::UNO_QUERY);
+uno::Reference< lang::XUnoTunnel > xWorkDocShell(
xClone->createClone(), uno::UNO_QUERY);
+SwXTextDocument* pWorkModel =
reinterpret_cast(xWorkDocShell->getSomething(SwXTextDocument::getUnoTunnelId()));
+xWorkDocSh = pWorkModel->GetDocShell();
+}
+else
+xWorkDocSh = pSourceDocSh->GetDoc()->CreateCopy(
true );
-if (xWorkDocSh->DoLoad(pWorkMed))
{
//create a view frame for the document
SfxViewFrame* pWorkFrame =
SfxViewFrame::LoadHiddenDocument( *xWorkDocSh, 0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.fre
[Libreoffice-commits] core.git: oox/source
oox/source/token/tokens.txt |2 ++ 1 file changed, 2 insertions(+) New commits: commit e1f90846af87bed94da736236e2eaa10bddfdd7b Author: Adam Co Date: Mon Feb 3 12:52:57 2014 +0200 Add tokens for 'table row' redlines (future patch) This patch adds 2 tokens for future patche's use of table row redline preservation. Change-Id: I20e6d1dd84a07f515076aaa3cd5b32c492ec476d Reviewed-on: https://gerrit.libreoffice.org/7801 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt index ea4f878..e9667b7 100644 --- a/oox/source/token/tokens.txt +++ b/oox/source/token/tokens.txt @@ -5001,6 +5001,8 @@ tableColumnId tableColumns tablePart tableParts +tableRowInsert +tableRowDelete tableStyle tableStyleElement tableStyleId ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - external/libetonyek
external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 | 26 ++ external/libetonyek/UnpackedTarball_libetonyek.mk |4 + 2 files changed, 30 insertions(+) New commits: commit b1f389fcf42c8dc60404be54f0e965406bdcd496 Author: David Tardon Date: Fri Dec 6 20:38:03 2013 +0100 fix build Change-Id: I65476b98a58b749619003965c41cfe0f32ae2e13 (cherry picked from commit 477e26b9ab681460823f7af042713e28f043cacb) Reviewed-on: https://gerrit.libreoffice.org/7996 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 b/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 new file mode 100644 index 000..816039b --- /dev/null +++ b/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 @@ -0,0 +1,26 @@ +From c2065764ae0826409f1dd683e52b7ca65f092972 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fridrich=20=C5=A0trba?= +Date: Fri, 6 Dec 2013 18:35:28 +0100 +Subject: [PATCH] Comma at the end of emum list + +Change-Id: I1370488e5bf682e23a923f37c09e76081aee7493 +--- + src/lib/KEYEnum.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/KEYEnum.h b/src/lib/KEYEnum.h +index f0e027f..9e5e61f 100644 +--- a/src/lib/KEYEnum.h b/src/lib/KEYEnum.h +@@ -33,7 +33,7 @@ enum KEYCapitalization + KEY_CAPITALIZATION_NONE, + KEY_CAPITALIZATION_ALL_CAPS, + KEY_CAPITALIZATION_SMALL_CAPS, +- KEY_CAPITALIZATION_TITLE, ++ KEY_CAPITALIZATION_TITLE + }; + + } +-- +1.8.4.2 + diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 52e6a95..d452574 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek)) $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL))) +$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ + external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 \ +)) + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source
basctl/source/dlged/managelang.cxx | 25 -
1 file changed, 25 deletions(-)
New commits:
commit af619501b790ef470828e280b3105a81542bec29
Author: Stephan Bergmann
Date: Tue Feb 11 14:03:35 2014 +0100
-Werror,-Wunused-function
Change-Id: I0b3399478c00e7e6db8973e9e4811f3f75c5a3db
diff --git a/basctl/source/dlged/managelang.cxx
b/basctl/source/dlged/managelang.cxx
index 3150bc9..e313641 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -54,31 +54,6 @@ bool localesAreEqual( const Locale& rLocaleLeft, const
Locale& rLocaleRight )
return bRet;
}
-namespace {
-long getLongestWordWidth( const OUString& rText, const Window& rWin )
-{
-long nWidth = 0;
-Reference< XBreakIterator > xBreakIter(
vcl::unohelper::CreateBreakIterator() );
-sal_Int32 nStartPos = 0;
-const Locale aLocale =
Application::GetSettings().GetUILanguageTag().getLocale();
-Boundary aBoundary = xBreakIter->getWordBoundary(
-rText, nStartPos, aLocale, WordType::ANYWORD_IGNOREWHITESPACES,
true );
-
-while ( aBoundary.startPos != aBoundary.endPos )
-{
-nStartPos = aBoundary.endPos;
-OUString sWord(rText.copy(aBoundary.startPos, aBoundary.endPos -
aBoundary.startPos));
-long nTemp = rWin.GetCtrlTextWidth( sWord );
-if ( nTemp > nWidth )
-nWidth = nTemp;
-aBoundary = xBreakIter->nextWord(
-rText, nStartPos, aLocale, WordType::ANYWORD_IGNOREWHITESPACES
);
-}
-
-return nWidth;
-}
-}
-
ManageLanguageDialog::ManageLanguageDialog(Window* pParent,
boost::shared_ptr xLMgr)
: ModalDialog(pParent, "ManageLanguagesDialog",
"modules/BasicIDE/ui/managelanguages.ui")
, m_xLocalizationMgr(xLMgr)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 74014, which changed state. Bug 74014 Summary: Editing: Cell formula not updating on redo, even with a forced recalculation https://bugs.freedesktop.org/show_bug.cgi?id=74014 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] sort Gerrit and askbot downtime at ~ 14:00 UTC today
Hi *, at around 14:00 UTC today gerrit and askbot will have a short maintenance downtime and change of IP (temporarily) The change of IP might cause delays until you can access the services at the new, temporary IP, depending how fast your DNS updates. gerrit will be reachable at 144.76.139.237 askbot will be reachable at 144.76.139.238 A separate announcement will be sent right before the change happens. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 70414] create VSProject files for code editing in MSVS from gbuild
https://bugs.freedesktop.org/show_bug.cgi?id=70414 --- Comment #12 from Björn Michaelsen --- (In reply to comment #10) > @Honza Havlíček - looks like an AWESOME AWESOME job ! > Do you mind posting a short tutorial on how one can get up & running with > this? I agree with Adam on both counts, this is truly awesome and it would be great to have a tutorial like https://www.youtube.com/watch?v=-5hVXeHNt2M&hd=1 for it. @Honza: Would you be willing to create something like that, or mentor someone else on it? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/data/table1.cxx | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
New commits:
commit d27af82cf997df2ddfb3ea689cf943338bd3df1a
Author: Eike Rathke
Date: Mon Feb 10 18:22:27 2014 +0100
do not loop 30 million cells to find a non-empty row
If for whatever reason an AutoFilter area was setup to extend down to,
for example, row 1048559 but the actual last data row is 15817, with 27
columns it took ScTable::GetDataArea() to look at 27884034 cells to find
the last non-empty data row ...
Change-Id: Ic8cbebe7ddf9b23c8edb55c4821d8a4c69e8b75d
(cherry picked from commit 6c5acfbefddeca1b2336cdc4158ec6e6f2a46858)
Reviewed-on: https://gerrit.libreoffice.org/7978
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index f958927..e0eb3eb 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -904,15 +904,9 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW&
rStartRow, SCCOL& rEndCol, S
{
if ( !bBottom && rEndRow > 0 && rStartRow < rEndRow )
{
-bool shrink = true;
-do
-{
-for ( SCCOL i = rStartCol; i<=rEndCol && shrink; i++)
-if (aCol[i].HasDataAt(rEndRow))
-shrink = false;
-if (shrink)
---rEndRow;
-}while( shrink && rEndRow > 0 && rStartRow < rEndRow );
+SCROW nLastDataRow = GetLastDataRow( rStartCol, rEndCol, rEndRow);
+if (nLastDataRow >= 0 && rStartRow <= nLastDataRow && nLastDataRow
< rEndRow)
+rEndRow = nLastDataRow;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/undo/undoblk3.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 04b11e8d5411f687fb573f94d6ed58ace7c424c4 Author: Kohei Yoshida Date: Tue Feb 11 01:08:15 2014 -0500 fdo#74014: Broadcast here Change-Id: Ib3c1e6b18af2c96c8c38237ab65f868ffec5f139 (cherry picked from commit 182ac74065d8724bf74003cb72928b2cfa7388e9) Reviewed-on: https://gerrit.libreoffice.org/7989 Tested-by: Markus Mohrhard Reviewed-by: Markus Mohrhard diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index fe94d09..3239b1c 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -141,6 +141,7 @@ void ScUndoDeleteContents::DoChange( const sal_Bool bUndo ) aCopyRange.aEnd.SetTab(nTabCount-1); pUndoDoc->CopyToDocument( aCopyRange, nUndoFlags, bMulti, pDoc, &aMarkData ); +BroadcastChanges(aCopyRange); DoSdrUndoAction( pDrawUndo, pDoc ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/mtvfunctions.hxx|2 +-
sc/source/core/data/column.cxx |8
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 517cf1185e5e3fd4eaedf6b49ffecbd957317bbb
Author: Kohei Yoshida
Date: Mon Feb 10 22:34:35 2014 -0500
fdo#74209: This search algorithm had another issue. This fixes it.
When the search range was i.e. 1-3, and the match was found at 5, the old
code would return 5 when in fact it should have failed. This change would
honor the end position and limit the search within specified search range.
Change-Id: If12a92fd3930ad128a5b0699a1addd96fb3a8eba
(cherry picked from commit 1da03a88a98b50633d61557de27e4c0702a665eb)
Reviewed-on: https://gerrit.libreoffice.org/7988
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/inc/mtvfunctions.hxx b/sc/inc/mtvfunctions.hxx
index 6955d21..fdf79fa 100644
--- a/sc/inc/mtvfunctions.hxx
+++ b/sc/inc/mtvfunctions.hxx
@@ -618,7 +618,7 @@ FindElement2(
break;
default:
{
-ElseRetType aRet = rFuncElse(*it, nOffset);
+ElseRetType aRet = rFuncElse(*it, nOffset, nDataSize);
if (aRet.second)
return PositionType(it, aRet.first);
}
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 487e3a0..47ef9cb 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2985,20 +2985,20 @@ public:
return const_cast(p)->IsMultilineResult();
}
-std::pair operator() (const sc::CellStoreType::value_type&
node, size_t nOffset)
+std::pair operator() (const sc::CellStoreType::value_type&
node, size_t nOffset, size_t nDataSize)
{
typedef std::pair RetType;
if (node.type == sc::element_type_empty)
return RetType(0, false);
-for (size_t i = nOffset; i < node.size; ++i)
+for (size_t i = 0; i < nDataSize; ++i)
{
-SCROW nRow = node.position + i;
+SCROW nRow = node.position + i + nOffset;
sal_uInt8 nScriptType = mrColumn.GetRangeScriptType(miAttrPos,
nRow, nRow, miCellPos);
if (IsAmbiguousScriptNonZero(nScriptType))
// Return the offset from the first row.
-return RetType(i, true);
+return RetType(i+nOffset, true);
}
return RetType(0, false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/filter/inc/numberformatsbuffer.hxx |2 -
sc/source/filter/inc/stylesbuffer.hxx|4 +-
sc/source/filter/oox/stylesbuffer.cxx| 47 +++
3 files changed, 38 insertions(+), 15 deletions(-)
New commits:
commit cd519128e9719875ccdc185afc47a28a5f107e0f
Author: Kohei Yoshida
Date: Mon Feb 10 16:03:54 2014 -0500
cp#100030: Use internal API to fill dxf styles during xlsx import.
It's faster, and it actually prevents a bug where styles fail to get
set when the document contains at least one protected sheet.
Change-Id: I9a5d7250ca44dd46364ab62f2e0130e967427c66
(cherry picked from commit d12c0e5d36cc106cb4f9a27dba2f29c10b5d6f93)
Reviewed-on: https://gerrit.libreoffice.org/7982
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx
b/sc/source/filter/inc/numberformatsbuffer.hxx
index 32c3611..52a68f0 100644
--- a/sc/source/filter/inc/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -77,7 +77,7 @@ public:
sal_Int32 finalizeImport(
const ::com::sun::star::uno::Reference<
::com::sun::star::util::XNumberFormats >& rxNumFmts,
const ::com::sun::star::lang::Locale& rFromLocale
);
-voidfillToItemSet( SfxItemSet& rItemSet, bool
bSkipPoolDefs ) const;
+void fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false )
const;
/** Writes the number format to the passed property map. */
voidwriteToPropertyMap( PropertyMap& rPropMap ) const;
diff --git a/sc/source/filter/inc/stylesbuffer.hxx
b/sc/source/filter/inc/stylesbuffer.hxx
index 6802e9b..e3c4036 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -520,7 +520,7 @@ public:
/** Returns the converted API border data struct. */
inline const ApiBorderData& getApiData() const { return maApiData; }
-voidfillToItemSet( SfxItemSet& rItemSet, bool
bSkipPoolDefs ) const;
+void fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false )
const;
/** Writes all border attributes to the passed property map. */
voidwriteToPropertyMap( PropertyMap& rPropMap ) const;
@@ -771,6 +771,8 @@ public:
/** Writes all formatting attributes to the passed property set. */
voidwriteToPropertySet( PropertySet& rPropSet ) const;
+void fillToItemSet( SfxItemSet& rSet ) const;
+
private:
FontRef mxFont; /// Font data.
NumberFormatRef mxNumFmt; /// Number format data.
diff --git a/sc/source/filter/oox/stylesbuffer.cxx
b/sc/source/filter/oox/stylesbuffer.cxx
index 49b1194..d14b353 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2498,6 +2498,22 @@ void Dxf::writeToPropertySet( PropertySet& rPropSet )
const
rPropSet.setProperties( aPropMap );
}
+void Dxf::fillToItemSet( SfxItemSet& rSet ) const
+{
+if (mxFont)
+mxFont->fillToItemSet(rSet, FONT_PROPTYPE_CELL);
+if (mxNumFmt)
+mxNumFmt->fillToItemSet(rSet);
+if (mxAlignment)
+mxAlignment->fillToItemSet(rSet);
+if (mxProtection)
+mxProtection->fillToItemSet(rSet);
+if (mxBorder)
+mxBorder->fillToItemSet(rSet);
+if (mxFill)
+mxFill->fillToItemSet(rSet);
+}
+
//
namespace {
@@ -3111,21 +3127,26 @@ OUString StylesBuffer::createCellStyle( sal_Int32 nXfId
) const
OUString StylesBuffer::createDxfStyle( sal_Int32 nDxfId ) const
{
OUString& rStyleName = maDxfStyles[ nDxfId ];
-if( rStyleName.isEmpty() )
+if (!rStyleName.isEmpty())
+return rStyleName;
+
+if (Dxf* pDxf = maDxfs.get(nDxfId).get())
{
-if( Dxf* pDxf = maDxfs.get( nDxfId ).get() )
-{
-rStyleName = OUStringBuffer( "ConditionalStyle_" ).append( nDxfId
+ 1 ).makeStringAndClear();
-// create the style sheet (this may change rStyleName if such a
style already exists)
-Reference< XStyle > xStyle = createStyleObject( rStyleName, false
);
-// write style formatting properties
-PropertySet aPropSet( xStyle );
-pDxf->writeToPropertySet( aPropSet );
-}
-// on error: fallback to default style
-if( rStyleName.isEmpty() )
-rStyleName = maCellStyles.getDefaultStyleName();
+rStyleName = OUStringBuffer("ConditionalStyle_").append(nDxfId +
1).makeStringAndClear();
+
+// Create a cell style. This may overwrite an existing style if
+// one with the same name exists.
+SfxItemSet& rStyleItemSet =
+ScfTools::MakeCellStyleSheet(
+*getScDocument().GetStyleSheetPool(), rStyleName,
true).GetIt
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |5 - source/text/sbasic/guide/translation.xhp |9 + 2 files changed, 5 insertions(+), 9 deletions(-) New commits: commit d331784b77abd32c9a2b9de883bb480519b84dfc Author: Caolán McNamara Date: Tue Feb 11 11:30:46 2014 + update help ids for manage languages dialog Change-Id: I7975c7ee7ccce9e6563cb0181441deeae08ee109 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index f021fd2..76ef4f8 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -812,7 +812,6 @@ HID_BASICIDE_BRKPROPS,63558, HID_BASICIDE_DIALOGWINDOW,63562, HID_BASICIDE_EDITORWINDOW,63563, HID_BASICIDE_LIBS,63545, -HID_BASICIDE_MANAGE_LANGUAGE,63571, HID_BASICIDE_MODULWINDOW,63561, HID_BASICIDE_OBJCAT_SHOW,63553, HID_BASICIDE_OBJECTCAT,63550, @@ -5375,15 +5374,11 @@ WID_SIMPLE_REF,25728,.uno:SimpleReferenz basctl_Edit_RID_MACROCHOOSER_RID_ED_MACRONAME,1317865477, basctl_Edit_RID_MACROOPTIONS_RID_ED_HELPNAME,1317947404, basctl_FloatingWindow_RID_BASICIDE_OBJCAT,1855062016, -basctl_ListBox_RID_DLG_MANAGE_LANGUAGE_LB_LANGUAGE,1343589890, basctl_ModalDialog_RID_MACROCHOOSER,1317863424, basctl_ModalDialog_RID_MACROOPTIONS,1317945344, basctl_MultiLineEdit_RID_MACROCHOOSER_RID_ML_DESCRIPTION,1317866000, basctl_MultiLineEdit_RID_MACROOPTIONS_RID_ME_DESCR,1317947911, basctl_NumericField_RID_MACROOPTIONS_RID_NF_HELPID,1317951498, -basctl_PushButton_RID_DLG_MANAGE_LANGUAGE_PB_ADD_LANG,1343590915, -basctl_PushButton_RID_DLG_MANAGE_LANGUAGE_PB_DEL_LANG,1343590916, -basctl_PushButton_RID_DLG_MANAGE_LANGUAGE_PB_MAKE_DEFAULT,1343590917, basctl_PushButton_RID_MACROCHOOSER_RID_PB_ASSIGN,1317868045, basctl_PushButton_RID_MACROCHOOSER_RID_PB_DEL,1317868044, basctl_PushButton_RID_MACROCHOOSER_RID_PB_EDIT,1317868042, diff --git a/source/text/sbasic/guide/translation.xhp b/source/text/sbasic/guide/translation.xhp index a0d5370..4b871b9 100644 --- a/source/text/sbasic/guide/translation.xhp +++ b/source/text/sbasic/guide/translation.xhp @@ -38,10 +38,11 @@ The Language toolbar in the Basic IDE dialog editor shows controls to enable and manage localizable dialogs. By default, any dialog that you create only contains string resources for one language. You may want to create dialogs that automatically show localized strings according to the user's language settings. Select the language for the strings that you want to edit. Click the Manage Languages icon to add languages.Manage Language icon is in sbasic/shared/02/2000.xhp -Click a language, then click Default to set the language as default, or click Delete to remove the language from the list. -Opens a dialog where you can add a language to the list. -Select a language in the list and click Delete to remove that language. When you remove all languages, the string resources for localizable dialogs are removed from all dialogs in the current library. -Select a language in the list and click Default to set the language as default language. + +Click a language, then click Default to set the language as default, or click Delete to remove the language from the list. +Opens a dialog where you can add a language to the list. +Select a language in the list and click Delete to remove that language. When you remove all languages, the string resources for localizable dialogs are removed from all dialogs in the current library. +Select a language in the list and click Default to set the language as default language. The default language will be used as a source for all other language strings. Add UI languages for your dialog strings. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 20 commits - basctl/inc basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk filter/source i18npool/inc i18npool/source include/svx reportdesign/source sax/source
basctl/UIConfig_basicide.mk |1
basctl/inc/helpid.hrc|1
basctl/source/dlged/dlgresid.src | 15 +
basctl/source/dlged/managelang.cxx | 109 ++--
basctl/source/dlged/managelang.hrc | 96 ---
basctl/source/dlged/managelang.src | 88 --
basctl/source/inc/dlgresid.hrc |6
basctl/source/inc/managelang.hxx | 15 -
basctl/uiconfig/basicide/ui/managelanguages.ui | 198 +++
filter/source/graphicfilter/idxf/dxfentrd.cxx|5
i18npool/inc/inputsequencechecker.hxx|6
i18npool/source/inputchecker/inputsequencechecker.cxx|4
i18npool/source/inputchecker/inputsequencechecker_hi.cxx |2
i18npool/source/inputchecker/inputsequencechecker_th.cxx |2
include/svx/galmisc.hxx | 10
reportdesign/source/ui/dlg/GroupsSorting.cxx | 13
sax/source/expatwrap/xml2utf.cxx |2
sc/source/ui/miscdlgs/highred.cxx|5
svx/source/gallery2/galtheme.cxx |4
sw/source/core/docnode/ndcopy.cxx|8
sw/source/core/fields/docufld.cxx|2
sw/source/core/swg/swblocks.cxx |4
sw/source/core/table/swtable.cxx | 20 -
sw/source/core/text/porfld.cxx |2
sw/source/core/text/porfly.cxx |3
sw/source/core/text/pormulti.cxx |4
sw/source/core/text/portxt.cxx |4
tools/source/fsys/urlobj.cxx |2
vcl/source/window/builder.cxx|1
29 files changed, 314 insertions(+), 318 deletions(-)
New commits:
commit 55c413b9cb2692b784c6c43a519be08146438237
Author: Caolán McNamara
Date: Tue Feb 11 11:55:18 2014 +
edit->changes->show has empty filter settings
Change-Id: I98999c0f402cf84d89b3a1167480dc27fdbc2be9
diff --git a/sc/source/ui/miscdlgs/highred.cxx
b/sc/source/ui/miscdlgs/highred.cxx
index a1d7c71..02538d5 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -63,6 +63,10 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB,
SfxChildWindow* pCW, Wind
{
FreeResource();
+aFilterCtr.HideRange(false);
+Size aCtrSize(LogicToPixel(Size(261 , 86), MAP_APPFONT));
+aFilterCtr.SetSizePixel(aCtrSize);
+
Point aFlFilterPt( aFlFilter.GetPosPixel() );
aFlFilterPt.Y() += aFlFilter.GetSizePixel().Height();
aFilterCtr.SetPosPixel( aFlFilterPt );
@@ -72,7 +76,6 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB,
SfxChildWindow* pCW, Wind
aOkButton.SetClickHdl(LINK( this, ScHighlightChgDlg, OKBtnHdl));
aHighlightBox.SetClickHdl(LINK( this, ScHighlightChgDlg, HighlightHandle
));
aFilterCtr.SetRefHdl(LINK( this, ScHighlightChgDlg, RefHandle ));
-aFilterCtr.HideRange(false);
aFilterCtr.Show();
SetDispatcherLock( true );
commit 281bdaaa0b2860ef2f2b08b1acb3f930f81cf020
Author: Caolán McNamara
Date: Tue Feb 11 10:31:42 2014 +
convert manage languages dialog to .ui
Change-Id: I1a50f8715040e64758cf18bee8ca6ac1d04652c8
diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index ca9e9b5..567bb0c 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/importlibdialog \
basctl/uiconfig/basicide/ui/libpage \
basctl/uiconfig/basicide/ui/managebreakpoints \
+ basctl/uiconfig/basicide/ui/managelanguages \
basctl/uiconfig/basicide/ui/modulepage \
basctl/uiconfig/basicide/ui/newlibdialog \
basctl/uiconfig/basicide/ui/organizedialog \
diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index 433a167..e04f99c 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -45,7 +45,6 @@
#define HID_BASICIDE_WATCHWINDOW_LIST
"BASCTL_HID_BASICIDE_WATCHWINDOW_LIST"
#define HID_BASICIDE_STACKWINDOW_LIST
"BASCTL_HID_BASICIDE_STACKWINDOW_LIST"
-#define HID_BASICIDE_MANAGE_LANGUAGE
"BASCTL_HID_BASICIDE_MANAGE_LANGUAGE"
#define HID_BASICIDE_ADDNEW_LANGUAGE
"BASCTL_HID_BASICIDE_ADDNEW_LANGUAGE"
#endif
diff --git a/basctl/source/dlged/dlgresid.src b/basctl/source/dlged/dlgresid.src
index 9e394e6..d1c3db2 100644
--- a/basctl/source/dlged/dlgresid.src
+++ b/basctl/source/dlged/dlgresid.src
@@ -132,4 +132,19 @@ String RID_STR_BRWTITLE_MULTISELECT
// ---
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d89c4916bdf6d461c40d18d148b7d899c8b585f8 Author: Caolán McNamara Date: Tue Feb 11 11:30:46 2014 + Updated core Project: help d331784b77abd32c9a2b9de883bb480519b84dfc diff --git a/helpcontent2 b/helpcontent2 index a6e3e5e..d331784 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a6e3e5ef597f1e429e6784e475c1a06b4265f08d +Subproject commit d331784b77abd32c9a2b9de883bb480519b84dfc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sw/source
sw/source/core/unocore/unoportenum.cxx |2 +-
sw/source/ui/ribbar/workctrl.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9098e3da831f24cd384f5bc70c42310792bb3bde
Author: Tsutomu Uchino
Date: Tue Feb 11 11:58:13 2014 +
#i56998# add space separator on the preview zoom control of the preview
toolbar
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 31c8ed1..f294840 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -799,7 +799,7 @@ SwZoomBox_Impl::SwZoomBox_Impl(
for(sal_uInt16 i = 0; i < sizeof(aZoomValues)/sizeof(sal_uInt16); i++)
{
String sEntry = String::CreateFromInt32(aZoomValues[i]);
-sEntry += '%';
+sEntry.AppendAscii( " %" );
InsertEntry(sEntry);
}
}
@@ -931,7 +931,7 @@ void SwPreviewZoomControl::StateChanged( sal_uInt16
/*nSID*/,
if(SFX_ITEM_AVAILABLE <= eState)
{
String sZoom(String::CreateFromInt32(((const
SfxUInt16Item*)pState)->GetValue()));
-sZoom += '%';
+sZoom.AppendAscii( " %" );
pBox->SetText(sZoom);
pBox->SaveValue();
}
commit b95fa33a4d2827adb8e16de5bae4e535d8c826c9
Author: Oliver-Rainer Wittmann
Date: Tue Feb 11 10:15:45 2014 +
124178: correct export of User Variable Input Fields
diff --git a/sw/source/core/unocore/unoportenum.cxx
b/sw/source/core/unocore/unoportenum.cxx
index c912aeb..7fbfe7b 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -892,7 +892,7 @@ lcl_ExportHints(
{
pUnoCrsr->Right(
-pAttr->GetFmtFld().GetField()->GetPar1().Len() + 2,
+pAttr->GetFmtFld().GetField()->ExpandField( true
).Len() + 2,
CRSR_SKIP_CHARS,
sal_False,
sal_False );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/redline.hxx | 10 ++
sw/source/core/doc/docredln.cxx | 16
2 files changed, 26 insertions(+)
New commits:
commit 8c2dca9d05ca3019a3f1e3d4ccfa13cd0711e615
Author: Adam Co
Date: Thu Jan 16 17:03:07 2014 +0200
Add derived class 'SwTableRowRedline' stub
Add stub derived class 'SwTableRowRedline' that will hold information
about the table row that got the changes, including the actual change
that was done (inserted\deleted).
Change-Id: I8b6ef9da3f3d9859a1e908dbcc018bc5c54b8329
Reviewed-on: https://gerrit.libreoffice.org/7466
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 3fe682e..3dc9dea 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
@@ -308,6 +309,15 @@ public:
virtual ~SwExtraRedline();
};
+/// Redline that holds information about a table-row that had some change
+class SW_DLLPUBLIC SwTableRowRedline : public SwExtraRedline
+{
+public:
+SwTableRowRedline( RedlineType_t eType, SwTableLine* pTableLine );
+SwTableRowRedline( const SwTableRowRedline& );
+virtual ~SwTableRowRedline();
+};
+
class SW_DLLPUBLIC SwRedlineHint : public SfxHint
{
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index ac9ce2d..8d599da 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -3963,4 +3963,20 @@ SwExtraRedline::~SwExtraRedline()
{
}
+SwTableRowRedline::SwTableRowRedline( RedlineType_t eTyp, SwTableLine*
pTableLine )
+:SwExtraRedline( eTyp )
+{
+(void)pTableLine;
+}
+
+SwTableRowRedline::SwTableRowRedline( const SwTableRowRedline& rCpy )
+: SwExtraRedline( rCpy )
+{
+(void)rCpy;
+}
+
+SwTableRowRedline::~SwTableRowRedline()
+{
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - accessibility/inc accessibility/source sax/source sc/source sd/source svtools/source
accessibility/inc/accessibility/extended/accessiblelistbox.hxx |4 ++--
accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx |3 +--
accessibility/source/extended/accessiblelistbox.cxx | 10
+++---
accessibility/source/extended/accessiblelistboxentry.cxx| 10
--
sax/source/tools/converter.cxx |4
sc/source/ui/Accessibility/AccessibleCell.cxx |4
sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx |8
+++-
sc/source/ui/Accessibility/AccessibleDocument.cxx |5
+
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx|2 ++
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx|8
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |2 ++
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |8
sd/source/ui/accessibility/AccessibleOutlineView.cxx|2 ++
svtools/source/control/valueacc.cxx |1 +
svtools/source/control/vclxaccessibleheaderbar.cxx |9
-
15 files changed, 69 insertions(+), 11 deletions(-)
New commits:
commit bfeef3f7234829db4bfbbd05376c2594c5dd6df0
Author: Michael Stahl
Date: Mon Feb 10 23:25:01 2014 +0100
sc: add some missing locks in new code
Change-Id: Ia35693f6c5915e898e5b137920431c7bebfc761c
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx
b/sc/source/ui/Accessibility/AccessibleCell.cxx
index e30a4da..454503c 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -512,6 +512,8 @@ uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes()
::com::sun::star::uno::RuntimeException,
std::exception)
{
+SolarMutexGuard aGuard;
+
uno::Any strRet;
if (mpViewShell)
{
@@ -542,6 +544,8 @@ uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes()
// cell has its own ParaIndent property, so when calling character attributes
on cell, the ParaIndent should replace the ParaLeftMargin if its value is not
zero.
uno::Sequence< beans::PropertyValue > SAL_CALL
ScAccessibleCell::getCharacterAttributes( sal_Int32 nIndex, const
::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw
(lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+SolarMutexGuard aGuard;
+
uno::Sequence< beans::PropertyValue > aAttribs =
AccessibleStaticTextBase::getCharacterAttributes( nIndex, aRequestedAttributes
);
beans::PropertyValue *pAttribs = aAttribs.getArray();
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index 0b5dc35..a620ce2 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -721,6 +721,8 @@ uno::Reference SAL_CALL
ScAccessibleDataPilotButton::getAcc
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet >
SAL_CALL ScAccessibleDataPilotButton::getAccessibleRelationSet( ) throw
(::com::sun::star::uno::RuntimeException)
{
+SolarMutexGuard g;
+
utl::AccessibleRelationSetHelper* pRelationSetHelper = new
utl::AccessibleRelationSetHelper;
uno::Reference< com::sun::star::accessibility::XAccessibleRelationSet >
xSet = pRelationSetHelper;
if(mxParent.is())
@@ -759,7 +761,9 @@ uno::Sequence SAL_CALL
ScAccessibleDataPilotButton::getImplementationI
OUString SAL_CALL
ScAccessibleDataPilotButton::createAccessibleDescription(void)
throw (::com::sun::star::uno::RuntimeException)
{
- if (mpFieldWindow)
+SolarMutexGuard g;
+
+if (mpFieldWindow)
return mpFieldWindow->GetHelpText();
return OUString();
}
@@ -822,6 +826,8 @@ OUString
ScAccessibleDataPilotButton::getAccessibleActionDescription ( sal_Int32
::com::sun::star::uno::Reference< XAccessibleKeyBinding >
ScAccessibleDataPilotButton::getAccessibleActionKeyBinding( sal_Int32 nIndex )
throw (lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
{
+SolarMutexGuard g;
+
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
throw lang::IndexOutOfBoundsException();
comphelper::OAccessibleKeyBindingHelper* pKeyBindingHelper = new
comphelper::OAccessibleKeyBindingHelper();
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 6271438..fc2a0ca 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1861,6 +1861,8 @@ OUString SAL_CALL
ScAccessibleDocument::getAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException)
{
+SolarMutexGuard g;
+
OUString aName =
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/docary.hxx | 26 ++
sw/inc/redline.hxx | 10
sw/source/core/doc/docredln.cxx | 87
sw/source/core/docnode/nodedump.cxx | 22 +
4 files changed, 145 insertions(+)
New commits:
commit 7949b380e054342c80035d406c89ddc5badacfad
Author: Adam Co
Date: Thu Jan 16 16:51:09 2014 +0200
New redline object and table for non-ranged redlines called 'SwExtraRedline'
Added a new redline object for non-ranged redlines called 'SwExtraRedline'.
Examples for such redlines are 'table row was inserted \ deleted',
'table properties changed', 'text was moved' etc.
Also - added a table for these redlines called 'SwExtraRedlineTbl'.
Change-Id: I9190093c97108b7e4923bc8a9feb441ad5c5694f
Reviewed-on: https://gerrit.libreoffice.org/7464
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index ea868e8..ed78fd2 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -34,6 +34,7 @@ class SwUndo;
class SwSectionFmt;
class SwNumRule;
class SwRangeRedline;
+class SwExtraRedline;
class SwUnoCrsr;
class SwOLENode;
class SwTxtFmtColl;
@@ -182,6 +183,31 @@ public:
using _SwRedlineTbl::empty;
};
+/// Table that holds 'extra' redlines, such as 'table row insert\delete',
'paragraph moves' etc...
+class SwExtraRedlineTbl
+{
+private:
+std::vectorm_aExtraRedlines;
+
+public:
+bool Contains(const SwExtraRedline* p) const;
+sal_uInt16 GetPos(const SwExtraRedline* p) const;
+
+bool Insert( SwExtraRedline* p );
+
+void Remove( sal_uInt16 nPos );
+bool Remove( const SwExtraRedline* p );
+void DeleteAndDestroy( sal_uInt16 nPos, sal_uInt16 nLen = 1 );
+void DeleteAndDestroyAll();
+
+void dumpAsXml(xmlTextWriterPtr w);
+
+sal_uInt16 GetSize() const { return
m_aExtraRedlines.size();}
+SwExtraRedline* GetRedline( sal_uInt16 uIndex ) const { return
m_aExtraRedlines.operator[]( uIndex ); }
+sal_uInt16 IsEmpty() const { return
m_aExtraRedlines.empty(); }
+};
+
+
class SwUnoCrsrTbl : public std::set {
public:
/// the destructor will free all objects still in the set
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index b946618..3fe682e 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -299,6 +299,16 @@ public:
bool operator<( const SwRangeRedline& ) const;
};
+/// Base object for 'Redlines' that are not of 'Ranged' type (like table row
insert\delete)
+class SW_DLLPUBLIC SwExtraRedline
+{
+public:
+SwExtraRedline( RedlineType_t eType );
+SwExtraRedline( const SwExtraRedline& );
+virtual ~SwExtraRedline();
+};
+
+
class SW_DLLPUBLIC SwRedlineHint : public SfxHint
{
#define SWREDLINE_INSERTED 1
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 7df8b57..ac9ce2d 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -3876,4 +3876,91 @@ bool SwDoc::IsInRedlines(const SwNode & rNode) const
return aPam.ContainsPosition(aPos);
}
+bool SwExtraRedlineTbl::Contains(const SwExtraRedline* p) const
+{
+return GetPos(p) != USHRT_MAX;
+}
+
+sal_uInt16 SwExtraRedlineTbl::GetPos(const SwExtraRedline* p) const
+{
+std::vector::const_iterator it =
std::find(m_aExtraRedlines.begin(), m_aExtraRedlines.end(), p);
+if( it == m_aExtraRedlines.end() )
+return USHRT_MAX;
+return it - m_aExtraRedlines.begin();
+}
+
+bool SwExtraRedlineTbl::Insert( SwExtraRedline* p )
+{
+m_aExtraRedlines.push_back( p );
+//p->CallDisplayFunc();
+return true;
+}
+
+void SwExtraRedlineTbl::Remove( sal_uInt16 nPos )
+{
+/*
+SwDoc* pDoc = 0;
+if( !nP && 1 == size() )
+pDoc = front()->GetDoc();
+*/
+
+m_aExtraRedlines.erase( m_aExtraRedlines.begin() + nPos );
+
+/*
+SwViewShell* pSh;
+if( pDoc && !pDoc->IsInDtor() &&
+0 != ( pSh = pDoc->GetCurrentViewShell()) )
+pSh->InvalidateWindows( SwRect( 0, 0, LONG_MAX, LONG_MAX ) );
+*/
+}
+
+bool SwExtraRedlineTbl::Remove( const SwExtraRedline* p )
+{
+sal_uInt16 nPos = GetPos(p);
+if (nPos != USHRT_MAX)
+Remove(nPos);
+return nPos != USHRT_MAX;
+}
+
+void SwExtraRedlineTbl::DeleteAndDestroy( sal_uInt16 nPos, sal_uInt16 nLen )
+{
+/*
+SwDoc* pDoc = 0;
+if( !nP && nL && nL == size() )
+pDoc = front()->GetDoc();
+*/
+
+for( std::vector::iterator it = m_aExtraRedlines.begin()
+ nPos; it != m_aExtraRedlines.begin() + nPos + nLen; ++it )
+delete *it;
+
+m_aExtraRedlines.erase( m_aExtraRedlines.begin() + nPos,
m_aExtraRedlines.begin() + nPos + nLen );
+
+/*
+SwViewShell* pSh;
+if( pDoc && !pDoc->IsInDtor() &&
+0 != ( pSh = pDoc->GetCurrentViewShell() ) )
+pSh->InvalidateWindows( SwRect( 0, 0,
Autogen options page!
Hi, The link for autogen options description page is linked to #Autogen? I couldn't find the related page on the wiki? Can anyone fix this? Place: https://wiki.documentfoundation.org/Development/How_to_build/Configure_options#Autogen Link to be fixed for: "page describing the options" Ahmad Warning: This message and its attachment, if any, are confidential and may contain information protected by law. If you are not the intended recipient, please contact the sender immediately and delete the message and its attachment, if any. You should not copy the message and its attachment, if any, or disclose its contents to any other person or use it for any purpose. Statements and opinions expressed in this e-mail and its attachment, if any, are those of the sender, and do not necessarily reflect those of King Abdulaziz city for Science and Technology (KACST) in the Kingdom of Saudi Arabia. KACST accepts no liability for any damage caused by this email. تحذير: هذه الرسالة وما تحويه من مرفقات (إن وجدت) تمثل وثيقة سرية قد تحتوي على معلومات محمية بموجب القانون. إذا لم تكن الشخص المعني بهذه الرسالة فيجب عليك تنبيه المُرسل بخطأ وصولها إليك، وحذف الرسالة ومرفقاتها (إن وجدت)، ولا يجوز لك نسخ أو توزيع هذه الرسالة أو مرفقاتها (إن وجدت) أو أي جزء منها، أو البوح بمحتوياتها للغير أو استعمالها لأي غرض. علماً بأن فحوى هذه الرسالة ومرفقاتها (ان وجدت) تعبر عن رأي المُرسل وليس بالضرورة رأي مدينة الملك عبدالعزيز للعلوم والتقنية بالمملكة العربية السعودية، ولا تتحمل المدينة أي مسئولية عن الأضرار الناتجة عن ما قد يحتويه هذا البريد. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx reportdesign/inc reportdesign/source sc/inc sc/source sd/inc sd/source svx/source sw/source
include/svx/svdmodel.hxx |4 ++--
reportdesign/inc/RptModel.hxx |2 +-
reportdesign/source/core/api/ReportDefinition.cxx |2 +-
reportdesign/source/core/sdr/RptModel.cxx |2 +-
sc/inc/drwlayer.hxx|2 +-
sc/source/core/data/drwlayer.cxx |2 +-
sd/inc/drawdoc.hxx |6 +++---
sd/source/core/drawdoc.cxx |4 ++--
sd/source/core/drawdoc2.cxx|4 ++--
sd/source/core/drawdoc4.cxx|2 +-
sd/source/ui/dlg/LayerTabBar.cxx |2 +-
sd/source/ui/func/fucushow.cxx |2 +-
sd/source/ui/func/fupage.cxx |2 +-
sd/source/ui/func/fusldlg.cxx |2 +-
sd/source/ui/func/futempl.cxx | 10 +-
sd/source/ui/sidebar/DocumentHelper.cxx|2 +-
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |2 +-
sd/source/ui/unoidl/unolayer.cxx |2 +-
sd/source/ui/view/MediaObjectBar.cxx |2 +-
sd/source/ui/view/Outliner.cxx |2 +-
sd/source/ui/view/drviews2.cxx |2 +-
sd/source/ui/view/drviewsb.cxx |4 ++--
sd/source/ui/view/drviewsg.cxx |2 +-
sd/source/ui/view/outlnvsh.cxx |2 +-
sd/source/ui/view/sdview2.cxx |2 +-
svx/source/dialog/_contdlg.cxx |4 ++--
svx/source/dialog/contwnd.cxx |4 ++--
svx/source/dialog/graphctl.cxx |2 +-
svx/source/dialog/imapwnd.cxx | 12 ++--
svx/source/svdraw/svdedxv.cxx |2 +-
svx/source/svdraw/svdmodel.cxx |2 +-
svx/source/svdraw/svdoole2.cxx |2 +-
sw/source/ui/shells/beziersh.cxx |4 ++--
sw/source/ui/shells/drawdlg.cxx|8
sw/source/ui/shells/drawsh.cxx |8
sw/source/ui/shells/drwbassh.cxx |4 ++--
sw/source/ui/shells/mediash.cxx|4 ++--
sw/source/ui/shells/navsh.cxx |4 ++--
38 files changed, 65 insertions(+), 65 deletions(-)
New commits:
commit 08c40a2474405b160aab96cabe115d8437d68f8a
Author: Noel Grandin
Date: Tue Feb 11 11:43:35 2014 +0200
sal_Bool->bool
Change-Id: I31fb9d5b49260fd1a8fc1312b01fd5632c97ab2e
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 8a3796a..a624e85 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -438,8 +438,8 @@ public:
// Modified-Flag. Wird automatisch gesetzt, wenn an den Pages oder
// Zeichenobjekten was geaendert wird. Zuruecksetzen muss man es
// jedoch selbst (z.B. bei Save() ...).
-sal_Bool IsChanged() const { return mbChanged; }
-virtual void SetChanged(sal_Bool bFlg = sal_True);
+bool IsChanged() const { return mbChanged; }
+virtual void SetChanged(bool bFlg = true);
// PageNotValid bedeutet, dass das Model lediglich Objekte traegt die zwar
// auf einer Page verankert sind, die Page aber nicht gueltig ist. Diese
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index 8c71619..66a229a 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -58,7 +58,7 @@ public:
OReportModel(::reportdesign::OReportDefinition* _pReportDefinition);
virtual ~OReportModel();
-virtual voidSetChanged(sal_Bool bFlg = sal_True);
+virtual voidSetChanged(bool bFlg = true) SAL_OVERRIDE;
virtual SdrPage*AllocPage(bool bMasterPage);
virtual SdrPage*RemovePage(sal_uInt16 nPgNum);
/** @returns the numbering type that is used to format page fields in
drawing shapes */
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx
b/reportdesign/source/core/api/ReportDefinition.cxx
index 6bb4ac4..b8ea4b6 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1934,7 +1934,7 @@ void SAL_CALL OReportDefinition::setModified( ::sal_Bool
_bModified ) throw (bea
if ( m_pImpl->m_bModified != _bModified )
{
m_pImpl->m_bModified = _bModified;
-if ( m_pImpl->m_pReportModel->IsChanged() != _bModified )
+if ( ( m_pImpl->m_pReportModel->IsChanged() ? 1 : 0 ) != _bModified )
m_pImpl->m_pReportModel->SetChanged(_bModified);
lang::EventObject aEvent(*this);
diff --git a/reportdesign/source/core/sdr/RptModel.cxx
b/reportdesign/source/core
[Libreoffice-commits] core.git: sax/source
sax/source/tools/converter.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 785c4f10b87ab47b853abf947dfb21117d55cca1
Author: Arnaud Versini
Date: Sun Feb 2 12:14:01 2014 +0100
fdo#72468 avoid out of bounds array access
Change-Id: I2bccdf1aaeb290a3cb8f76cd831a419e1776e92f
Reviewed-on: https://gerrit.libreoffice.org/7775
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 8a0d828..48ad958 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1367,7 +1367,7 @@ lcl_MaxDaysPerMonth(const sal_Int32 nMonth, const
sal_Int32 nYear)
{
static const sal_uInt16 s_MaxDaysPerMonth[12] =
{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-OSL_ASSERT(0 < nMonth && nMonth <= 12);
+assert(0 < nMonth && nMonth <= 12);
if ((2 == nMonth) && lcl_isLeapYear(nYear))
{
return 29;
@@ -1545,8 +1545,8 @@ static bool lcl_parseDate(
if (!bIgnoreInvalidOrMissingDate)
{
bSuccess &= (0 < nDay);
+bSuccess &= (nDay <= lcl_MaxDaysPerMonth(nMonth, nYear));
}
-bSuccess &= (nDay <= lcl_MaxDaysPerMonth(nMonth, nYear));
}
if (bSuccess && (nPos < string.getLength()))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - desktop/source framework/inc framework/source framework/util
desktop/source/app/app.cxx | 14
framework/inc/services/ContextChangeEventMultiplexer.hxx| 139
framework/inc/services/desktop.hxx |6
framework/inc/services/sessionlistener.hxx | 157 --
framework/source/register/registerservices.cxx |8
framework/source/services/ContextChangeEventMultiplexer.cxx | 173 +++
framework/source/services/sessionlistener.cxx | 186
framework/util/fwk.component|6
8 files changed, 259 insertions(+), 430 deletions(-)
New commits:
commit c864bd31056677277919078c4fd04966ef8b14de
Author: Matúš Kukan
Date: Wed Jan 22 18:39:49 2014 +0100
fwk: Constructor feature for one instance ContextChangeEventMultiplexer.
Change-Id: Ibb89e4dd46fc5d1f8a85f96b7e4677fa764bb112
diff --git a/framework/inc/services/ContextChangeEventMultiplexer.hxx
b/framework/inc/services/ContextChangeEventMultiplexer.hxx
deleted file mode 100644
index 1d7e2b1..000
--- a/framework/inc/services/ContextChangeEventMultiplexer.hxx
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_CONTEXTCHANGEEVENTMULTIPLEXER_HXX
-#define INCLUDED_FRAMEWORK_INC_SERVICES_CONTEXTCHANGEEVENTMULTIPLEXER_HXX
-
-#include
-
-#include
-#include
-
-#include "macros/xserviceinfo.hxx"
-
-#include
-#include
-
-
-namespace
-{
-typedef ::cppu::WeakComponentImplHelper4 <
-css::ui::XContextChangeEventMultiplexer,
-css::lang::XSingleComponentFactory,
-css::lang::XServiceInfo,
-css::lang::XEventListener
-> ContextChangeEventMultiplexerInterfaceBase;
-}
-
-
-namespace cssu = ::com::sun::star::uno;
-namespace cssl = ::com::sun::star::lang;
-
-namespace framework {
-
-class ContextChangeEventMultiplexer
-: private ::boost::noncopyable,
- private ::cppu::BaseMutex,
- public ContextChangeEventMultiplexerInterfaceBase
-{
-public:
-ContextChangeEventMultiplexer(const
cssu::Reference& rxContext);
-virtual ~ContextChangeEventMultiplexer (void);
-
-virtual void SAL_CALL disposing (void);
-
-// XContextChangeEventMultiplexer
-virtual void SAL_CALL addContextChangeEventListener (
-const cssu::Reference&
rxListener,
-const cssu::Reference& rxEventFocus)
-throw(cssu::RuntimeException, cssl::IllegalArgumentException);
-virtual void SAL_CALL removeContextChangeEventListener (
-const cssu::Reference&
rxListener,
-const cssu::Reference& rxEventFocus)
-throw(cssu::RuntimeException, cssl::IllegalArgumentException);
-virtual void SAL_CALL removeAllContextChangeEventListeners (
-const cssu::Reference&
rxListener)
-throw(cssu::RuntimeException, cssl::IllegalArgumentException);
-virtual void SAL_CALL broadcastContextChangeEvent (
-const css::ui::ContextChangeEventObject& rContextChangeEventObject,
-const cssu::Reference& rxEventFocus)
-throw(cssu::RuntimeException);
-
-// XSingleComponentFactory
-virtual cssu::Reference SAL_CALL
createInstanceWithContext (
-const cssu::Reference& rxContext)
-throw (cssu::Exception, cssu::RuntimeException);
-virtual cssu::Reference SAL_CALL
createInstanceWithArgumentsAndContext (
-const cssu::Sequence& rArguments,
-const cssu::Reference& rxContext)
-throw (cssu::Exception, cssu::RuntimeException);
-
-// XServiceInfo
-virtual ::rtl::OUString SAL_CALL getImplementationName (void)
-throw (cssu::RuntimeException);
-virtual sal_Bool SAL_CALL supportsService (
-const ::rtl::OUString& rsServiceName)
-throw (cssu::RuntimeException);
-virtual cssu::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames
(void)
-throw (cssu::RuntimeException);
-
-// XEventListener
-virtual void SAL_CALL disposing (
-const css::lang::EventObject& rEvent)
-throw (cssu::RuntimeException);
-
-static ::rtl::OUString SAL_C
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/salbmp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0d0abfaae9feadf9c4c4c4232f888ba0a1883029
Author: Tor Lillqvist
Date: Tue Feb 11 12:21:10 2014 +0200
Bin old leftover debugging fprintf
Change-Id: Ia169881d8b13ce8b7e4d709ef831e638085ef3ab
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 0d665ff..98a6938 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -767,7 +767,7 @@ BitmapBuffer* QuartzSalBitmap::AcquireBuffer( bool
/*bReadOnly*/ )
if( !maUserBuffer.get() )
// || maContextBuffer.get() && (maUserBuffer.get() != maContextBuffer.get()) )
{
-fprintf(stderr,"ASB::Acq(%dx%d,d=%d)\n",mnWidth,mnHeight,mnBits);
+// fprintf(stderr,"ASB::Acq(%dx%d,d=%d)\n",mnWidth,mnHeight,mnBits);
// TODO: AllocateUserData();
return NULL;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/gerrit-filter-domain
scripts/gerrit-filter-domain |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a383a5391887b2b89b7e1443762d3f1a848b9f7f
Author: Jan Holesovsky
Date: Tue Feb 11 10:49:44 2014 +0100
Make it work without logerrit alias.
diff --git a/scripts/gerrit-filter-domain b/scripts/gerrit-filter-domain
index 4e5f78f..8ff7d6c 100755
--- a/scripts/gerrit-filter-domain
+++ b/scripts/gerrit-filter-domain
@@ -31,7 +31,7 @@ def filterDomain(changes, domain):
def main(argv):
domain = argv[0]
blacklist = argv[1:]
-buf = subprocess.check_output(['ssh', 'logerrit', 'gerrit', 'query',
'status:open', '--format', 'JSON', '--all-approvals', '--files'])
+buf = subprocess.check_output(['ssh', 'gerrit.libreoffice.org', '-p',
'29418', 'gerrit', 'query', 'status:open', '--format', 'JSON',
'--all-approvals', '--files'])
changes = []
for line in buf.decode('utf-8').split('\n'):
i = json.loads(line)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70414] create VSProject files for code editing in MSVS from gbuild
https://bugs.freedesktop.org/show_bug.cgi?id=70414 --- Comment #11 from Michael Meeks --- $ make vs2012-ide-integration under Cygwin should generate the various sln files inside modules. Honza - thanks for the great update; are we still using Cygwin 'make' underneath ? or are we starting to do native compiles ? [ if so, I guess some re-build performance testing is in order ;-]. Thanks ! -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a9/325263271883fb147351d287c817ea7984fbe9
a9/325263271883fb147351d287c817ea7984fbe9 |1 + 1 file changed, 1 insertion(+) New commits: commit 6390a82d7199a21c43ed51b507759ee91ce50721 Author: Caolán McNamara Date: Tue Feb 11 09:25:09 2014 + Notes added by 'git notes add' diff --git a/a9/325263271883fb147351d287c817ea7984fbe9 b/a9/325263271883fb147351d287c817ea7984fbe9 new file mode 100644 index 000..3c990af --- /dev/null +++ b/a9/325263271883fb147351d287c817ea7984fbe9 @@ -0,0 +1 @@ +merged as: 38ea39b517b218573b8d1430d7b06280bcfef0fb ___ 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/graphic/ndgrf.cxx | 38 ++
1 file changed, 38 insertions(+)
New commits:
commit 38ea39b517b218573b8d1430d7b06280bcfef0fb
Author: Armin Le Grand
Date: Mon Feb 10 22:24:18 2014 +
Resolves: #i15508# keep the original file and format AFAP...
when breaking links to graphic contents in Writer
(cherry picked from commit a9325263271883fb147351d287c817ea7984fbe9)
Conflicts:
sw/source/core/graphic/ndgrf.cxx
Change-Id: I86e2b80b95f4e26a734f56d060f97e6430ae56b8
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 8d2cb3e..d25123f 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -724,15 +724,53 @@ void SwGrfNode::ReleaseLink()
{
if( refLink.Is() )
{
+// #i15508# remember some stuff from the linked graphic
+const OUString aFileName(maGrfObj.GetLink());
+const Graphic aLocalGraphic(maGrfObj.GetGraphic());
+const bool bHasOriginalData(aLocalGraphic.IsLink());
+
{
bInSwapIn = sal_True;
SwBaseLink* pLink = (SwBaseLink*)(::sfx2::SvBaseLink*) refLink;
pLink->SwapIn( sal_True, sal_True );
bInSwapIn = sal_False;
}
+
getIDocumentLinksAdministration()->GetLinkManager().Remove( refLink );
refLink.Clear();
maGrfObj.SetLink();
+
+// #i15508# added extra processing after getting rid of the link. Use
whatever is
+// known from the formally linked graphic to get to a state as close
to a directly
+// unlinked insterted graphic as possible. Goal is to have a valid
GfxLink at the
+// ImplGraphic (see there) that holds temporary data to the original
data and type
+// information about the original data. Only when this is given will
+// SvXMLGraphicHelper::ImplInsertGraphicURL which is used at export
use that type
+// and use the original graphic at export for the ODF, without evtl.
recoding
+// of trhe bitmap graphic data to something without loss (e.g. PNG)
but bigger
+if(bHasOriginalData)
+{
+// #i15508# if we have the original data at the Graphic, let it
survive
+// by using that Graphic again, this time at a GraphicObject
without link.
+// This happens e.g. when inserting a linked graphic and breaking
the link
+maGrfObj.SetGraphic(aLocalGraphic);
+}
+else if(!aFileName.isEmpty())
+{
+// #i15508# we have no original data, but a file name. This
happens e.g.
+// when inserting a linked graphic and save, reload document. Try
to access
+// that data from the original file; if this works, use it. Else
use the
+// data we have (but without knowing the original format)
+int nRes = GRFILTER_OK;
+GraphicFilter& rFlt = GraphicFilter::GetGraphicFilter();
+Graphic aNew;
+nRes = GraphicFilter::LoadGraphic( aFileName, OUString(), aNew,
&rFlt);
+
+if(GRFILTER_OK == nRes)
+{
+maGrfObj.SetGraphic(aNew);
+}
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70414] create VSProject files for code editing in MSVS from gbuild
https://bugs.freedesktop.org/show_bug.cgi?id=70414 --- Comment #10 from Adam CloudOn --- @Honza Havlíček - looks like an AWESOME AWESOME job ! Do you mind posting a short tutorial on how one can get up & running with this? Simply pull latest master on Windows & one should find 'proj' files ? or some 'batch' file needs to be run? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 58/f18227a16379b5a4b3530b6ab2b683a63e6906
58/f18227a16379b5a4b3530b6ab2b683a63e6906 |1 + 1 file changed, 1 insertion(+) New commits: commit 414c17e10e2d55d4612f6bda49cd0aabd44b9ffa Author: Caolán McNamara Date: Tue Feb 11 09:14:08 2014 + Notes added by 'git notes add' diff --git a/58/f18227a16379b5a4b3530b6ab2b683a63e6906 b/58/f18227a16379b5a4b3530b6ab2b683a63e6906 new file mode 100644 index 000..4a2ba5a --- /dev/null +++ b/58/f18227a16379b5a4b3530b6ab2b683a63e6906 @@ -0,0 +1 @@ +reject: retain nemeths variants I think for now ___ 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
dev/null |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 15
sw/source/filter/ww8/docxattributeoutput.cxx | 47 ---
sw/source/filter/ww8/docxattributeoutput.hxx |3 -
4 files changed, 3 insertions(+), 62 deletions(-)
New commits:
commit be7d41a2bed7f424f38e2e7340f9b98c3f4f8fa2
Author: Miklos Vajna
Date: Tue Feb 11 09:43:59 2014 +0100
Revert "fdo#72563 : PAGEREF field tag not preserved during Roundtrip"
This reverts commit 138bd3d656c30911d5f45a8b6804e50857f6b30c. See
comment 5 in the bugreport, the fix in its current form causes more
trouble than it fixes.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I64f64f02a2e073b96e165c81bd2f85928e5527bc
diff --git a/sw/qa/extras/ooxmlexport/data/testPageref.docx
b/sw/qa/extras/ooxmlexport/data/testPageref.docx
deleted file mode 100644
index 65ca38a..000
Binary files a/sw/qa/extras/ooxmlexport/data/testPageref.docx and /dev/null
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f6e168b..26b2fe6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2299,7 +2299,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69649, "fdo69649.docx")
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
if (!pXmlDoc)
return;
-xmlNodeSetPtr pXmlNodes =
getXPathNode(pXmlDoc,"/w:document/w:body/w:p[21]/w:hyperlink/w:r[5]/w:t");
+xmlNodeSetPtr pXmlNodes =
getXPathNode(pXmlDoc,"/w:document/w:body/w:p[21]/w:hyperlink/w:r[2]/w:t");
xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
OUString contents = OUString::createFromAscii((const
char*)((pXmlNode->children[0]).content));
CPPUNIT_ASSERT(contents.match("15"));
@@ -2863,19 +2863,6 @@ DECLARE_OOXMLEXPORT_TEST(testGradientFillPreservation,
"gradient-fill-preservati
"val", "16");
}
-DECLARE_OOXMLEXPORT_TEST(testPageref, "testPageref.docx")
-{
-// fdo#72563 : There was a problem that in case of TOC,PAGEREF field tag
was not preserved during Roundtrip
-// This test case is to verify that PAGEREF tag is coming with proper
values inside tag.
-xmlDocPtr pXmlDoc = parseExport();
-if (!pXmlDoc)
-return;
-xmlNodeSetPtr pXmlNodes =
getXPathNode(pXmlDoc,"/w:document/w:body/w:p[2]/w:hyperlink/w:r[3]/w:instrText");
-xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
-OUString contents = OUString::createFromAscii((const
char*)((pXmlNode->children[0]).content));
-CPPUNIT_ASSERT(contents.match("PAGEREF _Toc355095261 \\h"));
-}
-
/* FIXME this still crashes
DECLARE_OOXMLEXPORT_TEST(testSegFaultWhileSave,
"test_segfault_while_save.docx")
{
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6e57286..7066d9b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -685,35 +685,10 @@ void DocxAttributeOutput::EndRun()
// write the run start + the run content
m_pSerializer->mergeTopMarks(); // merges the "actual run start"
+
// append the actual run end
m_pSerializer->endElementNS( XML_w, XML_r );
-if(m_startedHyperlink && m_hyperLinkAnchor != "")
-{
-OUString sToken;
-m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
-m_pSerializer->startElementNS( XML_w, XML_fldChar,
-FSNS( XML_w, XML_fldCharType ), "begin",
-FSEND );
-m_pSerializer->endElementNS( XML_w, XML_fldChar );
-m_pSerializer->endElementNS( XML_w, XML_r );
-
-
-m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
-sToken = "PAGEREF " + m_hyperLinkAnchor + " \\h"; // '\h' Creates a
hyperlink to the bookmarked paragraph.
-DoWriteCmd( sToken );
-m_pSerializer->endElementNS( XML_w, XML_r );
-
-
-// Write the Field separator
-m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
-m_pSerializer->singleElementNS( XML_w, XML_fldChar,
-FSNS( XML_w, XML_fldCharType ), "separate",
-FSEND );
-m_pSerializer->endElementNS( XML_w, XML_r );
-
-}
-
WritePostponedMath();
WritePendingPlaceholder();
@@ -726,17 +701,6 @@ void DocxAttributeOutput::EndRun()
{
if ( m_startedHyperlink )
{
-if( m_endPageRef )
-{
-// Hyperlink is started and fldchar "end" needs to be written
for PAGEREF
-m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
-m_pSerializer->singleElementNS( XML_w, XML_fldChar,
-FSNS( XML_w, XML_fldCharType ), "end",
-FSEND );
-m_pSerializer->endElementNS( XML_w, XML_r );
-m_endPageRef = false;
-}
-
m_pSerializer->endElementNS( XML
