[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Jean-Baptiste Faure jbf.fa...@sud-ouest.org changed: What|Removed |Added Depends on||51300 --- Comment #47 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org --- I nominate bug 51300 : comments in XLS files are shown in white on yellow, so unreadable. -- 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] .: Branch 'libreoffice-4-0' - cui/source vcl/inc vcl/source
cui/source/dialogs/about.cxx | 39 ++--
vcl/inc/vcl/svapp.hxx|1
vcl/inc/vcl/svgdata.hxx |1
vcl/source/app/brand.cxx | 46 ---
vcl/source/gdi/svgdata.cxx | 29 +++
5 files changed, 55 insertions(+), 61 deletions(-)
New commits:
commit b739389dba055f300d2e738474f468a1c672dcfb
Author: Muthu Subramanian sumu...@suse.com
Date: Thu Dec 13 12:37:18 2012 +0530
fdo#56402: SVG in About Dialog.
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index ddc3b46..cc62e89 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -207,22 +207,19 @@ void AboutDialog::LayoutControls()
Size aLogoSize( aIdealTextWidth, aIdealTextWidth / 20 );
Point aLogoPos( 0, 0 );
-#ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
-vcl::RenderGraphicRasterizer aRasterizerLogo =
Application::LoadBrandSVG(flat_logo);
-if ( !aRasterizerLogo.GetRenderGraphic().IsEmpty()
- aRasterizerLogo.GetDefaultSizePixel().Width() 0
aRasterizerLogo.GetDefaultSizePixel().Height() 0 )
+if( Application::LoadBrandSVG(flat_logo, aLogoBitmap)
+!aLogoBitmap.IsEmpty() )
{
-const float aLogoWidthHeightRatio =
(float)aRasterizerLogo.GetDefaultSizePixel().Width() /
(float)aRasterizerLogo.GetDefaultSizePixel().Height();
+const float aLogoWidthHeightRatio =
(float)aLogoBitmap.GetSizePixel().Width() /
(float)aLogoBitmap.GetSizePixel().Height();
aLogoSize.Width() = aDialogSize.Width() ;
aLogoSize.Height() = aLogoSize.Width() / aLogoWidthHeightRatio ;
+aLogoBitmap.Scale(aLogoSize);
-aLogoBitmap = aRasterizerLogo.Rasterize( aLogoSize );
aLogoImage.SetImage( Image( aLogoBitmap ) );
aLogoImage.SetPosSizePixel( aLogoPos, aLogoSize );
aLogoImage.Show();
}
else
-#endif
{
aLogoPos.X() = aDialogBorder;
aLogoPos.Y() = aDialogBorder;
@@ -277,27 +274,21 @@ void AboutDialog::LayoutControls()
// Layout background image
-#ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
-if (
!(Application::GetSettings().GetStyleSettings().GetHighContrastMode()) ) {
-vcl::RenderGraphicRasterizer aRasterizerBackground =
Application::LoadBrandSVG(shell/about);
+if (
!(Application::GetSettings().GetStyleSettings().GetHighContrastMode())
+ Application::LoadBrandSVG(shell/about, aBackgroundBitmap)
+ !aBackgroundBitmap.IsEmpty() )
+{
+const float aBackgroundWidthHeightRatio =
(float)aBackgroundBitmap.GetSizePixel().Width() /
+(float)aBackgroundBitmap.GetSizePixel().Height();
+Size aBackgroundSize (aDialogSize.Width(), aDialogSize.Width() /
aBackgroundWidthHeightRatio );
-if ( !aRasterizerBackground.GetRenderGraphic().IsEmpty()
-aRasterizerBackground.GetDefaultSizePixel().Width() 0
aRasterizerBackground.GetDefaultSizePixel().Height() 0 )
+if ( aBackgroundSize.Height() aDialogSize.Height())
{
-const float aBackgroundWidthHeightRatio =
(float)aRasterizerBackground.GetDefaultSizePixel().Width() /
-
(float)aRasterizerBackground.GetDefaultSizePixel().Height();
-Size aBackgroundSize (aDialogSize.Width(), aDialogSize.Width() /
aBackgroundWidthHeightRatio );
-
-if ( aBackgroundSize.Height() aDialogSize.Height())
-{
-aBackgroundSize.Width() = aDialogSize.Height() *
aBackgroundWidthHeightRatio ;
-aBackgroundSize.Height() = aDialogSize.Height();
-}
-
-aBackgroundBitmap = aRasterizerBackground.Rasterize(
aBackgroundSize );
+aBackgroundSize.Width() = aDialogSize.Height() *
aBackgroundWidthHeightRatio ;
+aBackgroundSize.Height() = aDialogSize.Height();
}
+aBackgroundBitmap.Scale(aBackgroundSize);
}
-#endif
SetOutputSizePixel( aDialogSize );
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index d95e44b..9715b1b 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -267,6 +267,7 @@ public:
static void SetAppName( const String rUniqueName );
static String GetAppName();
static bool LoadBrandBitmap (const char* pName, BitmapEx
rBitmap);
+static bool LoadBrandSVG( const char *pName, BitmapEx
rBitmap );
// default name of the application for message dialogs and printing
static void SetDisplayName( const UniString rDisplayName
);
diff --git a/vcl/inc/vcl/svgdata.hxx b/vcl/inc/vcl/svgdata.hxx
index 488092c..dc4c9e5 100644
--- a/vcl/inc/vcl/svgdata.hxx
+++ b/vcl/inc/vcl/svgdata.hxx
@@ -57,6 +57,7 @@ private:
public:
SvgData(const SvgDataArray rSvgDataArray, sal_uInt32 nSvgDataArrayLength,
const rtl::OUString rPath);
+SvgData(const
[PATCH] Change in core[libreoffice-3-6]: Take extra cache/uno_packages/*.tmp_/*properties files into ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1313 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/13/1313/1 Take extra cache/uno_packages/*.tmp_/*properties files into account ...when migrating user extensions from an old user profile. Change-Id: I4425eba1e840bfdb33782bb3ed0542ce48b2f75f (cherry picked from commit bd9c4510ff13ab7e935ed12c5b6d1f132c6f2b79) --- M desktop/source/migration/services/oo3extensionmigration.cxx 1 file changed, 14 insertions(+), 11 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1313 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4425eba1e840bfdb33782bb3ed0542ce48b2f75f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help with updating types.rdb
On Wed, Dec 12, 2012 at 01:12:03PM -0500, Kohei Yoshida wrote: I'm trying to unpublish several UNO API as discussed in ESC meeting. I've done unpublishing but am struggling with updating the types.rdb. I'm running make cmd cmd='./types_reference/update-rdb.sh com/sun/star/sheet/DataPilotSource.idl (...) inside offapi directory, and I'm getting make: *** No rule to make target `cmd'. Stop. Running from the top-level directory seems to do *something* at least :) $ make cmd cmd='./offapi/type_reference/update-rdb.sh com/sun/star/sheet/DataPilotSource.idl' make -r -f /home/master/src/libreoffice/workdirs/libreoffice-4.0/Makefile.top cmd make[1]: Entering directory `/home/master/src/libreoffice/workdirs/libreoffice-4.0' echo custom cmd ( ./offapi/type_reference/update-rdb.sh com/sun/star/sheet/DataPilotSource.idl ) custom cmd sanity check diff: 1c1 Registry file:///home/master/src/libreoffice/workdirs/libreoffice-4.0/offapi/type_reference/types.rdb: --- Registry file:///home/master/src/libreoffice/workdirs/libreoffice-4.0/tmp/out2.rdb: make[1]: Leaving directory`/home/master/src/libreoffice/workdirs/libreoffice-4.0' -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 3 commits - sw/inc sw/source
sw/inc/iodetect.hxx |3 +--
sw/source/filter/basflt/iodetect.cxx | 15 ---
sw/source/ui/uno/swdet2.cxx |2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 4a60855a3bb42e6f7f9474314d496e8fe8188c90
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 29 09:48:24 2012 +
.dot files sometimes rejected by writer, bnc#793422
because CWW8 appears twice, once for normal .doc and once for .dot. So a
.dot
files is tested twice if it's supported by the WW8 filter. Depending on the
(effectively arbitrary) order they appear in the list .dots may fail the
is a
normal non template .doc test after the is a template .dot test and get
rejected as a CWW8 candidate.
Change-Id: I88aec29fdd5f9ec4dd4ad2813ff3c6b8fa5c5461
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/sw/source/filter/basflt/iodetect.cxx
b/sw/source/filter/basflt/iodetect.cxx
index b99d57c..f32fa1c 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -266,6 +266,12 @@ sal_Bool SwIoSystem::IsFileFilter(SfxMedium rMedium,
const String rFmtName)
}
}
}
+//The same underlying filter can appear multiple times in the
+//filter list, e.g. CWW8 filter twice, once for .doc and once for
+//.dot. We just care here if its either, not enforce that it's
+//both which would be a bit of an odd requirement
+if (bRet)
+break;
}
pFltr = aIter.Next();
commit 20938c1b7a1f3a536c045d8e4fad6b04e1371c27
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 29 09:29:19 2012 +
optional ppFlt argument never used
Change-Id: Ib2c68091f14d04818ae5e7db0ad7b8a1ec151f4f
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index cc58b29..f8ff622 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -111,8 +111,7 @@ public:
// Detect whether the given file is in the given format.
// For now, only our own filters are supported!
-static sal_Bool IsFileFilter( SfxMedium rMedium, const String rFmtName,
-const SfxFilter** ppFlt = 0 );
+static sal_Bool IsFileFilter(SfxMedium rMedium, const String rFmtName);
static sal_Bool IsValidStgFilter( SotStorage , const SfxFilter );
static sal_Bool IsValidStgFilter( const com::sun::star::uno::Reference
com::sun::star::embed::XStorage rStg, const SfxFilter rFilter);
diff --git a/sw/source/filter/basflt/iodetect.cxx
b/sw/source/filter/basflt/iodetect.cxx
index 7a72a6f..b99d57c 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -211,8 +211,7 @@ void TerminateBuffer(sal_Char *pBuffer, sal_uLong
nBytesRead, sal_uLong nBufferL
/* Feststellen ob das File in dem entsprechenden Format vorliegt. */
/* Z.z werden nur unsere eigene Filter unterstuetzt */
-sal_Bool SwIoSystem::IsFileFilter( SfxMedium rMedium, const String rFmtName,
-const SfxFilter** ppFilter )
+sal_Bool SwIoSystem::IsFileFilter(SfxMedium rMedium, const String rFmtName)
{
sal_Bool bRet = sal_False;
@@ -267,9 +266,6 @@ sal_Bool SwIoSystem::IsFileFilter( SfxMedium rMedium,
const String rFmtName,
}
}
}
-
-if( bRet ppFilter )
-*ppFilter = pFltr;
}
pFltr = aIter.Next();
diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx
index 40e4be5..5594438 100644
--- a/sw/source/ui/uno/swdet2.cxx
+++ b/sw/source/ui/uno/swdet2.cxx
@@ -65,7 +65,7 @@ sal_uLong SwFilterDetect::DetectFilter( SfxMedium rMedium,
const SfxFilter** pp
String aPrefFlt = (*ppFilter)-GetUserData();
// detection for TextFilter needs an additional checking
-sal_Bool bDetected = SwIoSystem::IsFileFilter( rMedium, aPrefFlt );
+sal_Bool bDetected = SwIoSystem::IsFileFilter(rMedium, aPrefFlt);
return bDetected ? nRet : ERRCODE_ABORT;
}
commit 9e16b4766a76b48bcb38c7d816975a3aae89ce2c
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 29 09:23:37 2012 +
Simplify SwIoSystem::IsFileFilter
bRet = bRet (pFltr-GetUserData().equals(rFmtName)); is already inside
an if
bRet = bRet (pFltr-GetUserData().equals(rFmtName)); condition
bRet = xStg.Is() IsValidStgFilter( *xStg, *pFltr ); is already inside an
if ( xStg.Is() ) condition
Change-Id: I2115041d99b6fcbae7a829557c37627d03b5ee24
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/sw/source/filter/basflt/iodetect.cxx
b/sw/source/filter/basflt/iodetect.cxx
index 41adf67..7a72a6f 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -244,8 +244,7 @@ sal_Bool SwIoSystem::IsFileFilter( SfxMedium
Re: is 'make check' supposed to work on ~master ?
On 12/12/2012 06:36 PM, John Smith wrote: Im trying to run 'make check' at toplevel on ~master. It fails for me at this point (soffice.bin crashes) : make /usr/local/src/libreoffice/workdir/unxlngi6.pro/JunitTest/comphelper_complex/done Is that crash reproducible for you? The backtrace doesn't give much of a clue to why it fails, so if it is reproducible running under Valgrind might help. In general, the online update mechanism spawns threads that it doesn't properly join again before exit, which is a notorious problem with tests (that often run quickly enough to terminate soffice.bin while the online update check is still in progress), so I recommend to configure with --disable-online-update (which is the implicit default on Linux anyway, though). But the backtrace here doesn't look like it is caused by that problem anyway. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: is 'make check' supposed to work on ~master ?
On 2012-12-13 11:35, Stephan Bergmann wrote: In general, the online update mechanism spawns threads that it doesn't properly join again before exit, which is a notorious problem with tests (that often run quickly enough to terminate soffice.bin while the online update check is still in progress), Is it not possible to pass in a parameter disabling the online-update-check? That should make the tests happier. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
what's with Rectangle::GetHeight() and GetWidth() in gen.hxx
Hi
I seem to have triggered a problem on the windows tinderbox, but I'm
struggling to understand why.
The error on the tinderbox looks like:
[build LNK] Library/ires.lib
Creating library
C:/cygwin/home/tinderbox/master-build/workdir/wntmsci13.pro/LinkTarget/Library/iembobj.lib
and object
C:/cygwin/home/tinderbox/master-build/workdir/wntmsci13.pro/LinkTarget/Library/iembobj.exp
docholder.o : error LNK2019: unresolved external symbol
__declspec(dllimport) public: long __thiscall
Rectangle::GetHeight(void)const (__imp_?GetHeight@Rectangle@@QBEJXZ)
referenced in function
__catch$?GetDocFrame@DocumentHolder@@AAE?AV?$Reference@VXFrame@frame@star@sun@com@@@uno@star@sun@com@@XZ$0
And the definition in gen.hxx looks like:
class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Rectangle
{
public:
longGetWidth() const;
longGetHeight() const;
}
inline long Rectangle::GetWidth() const
{
.
}
Firstly, there seems to be a missing inline statement in the class
header section.
Secondly, given that there __is__ an inline modifier, why would the
windows compiler be trying to link this function externally?
Regards, Noel Grandin
Disclaimer: http://www.peralex.com/disclaimer.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: is 'make check' supposed to work on ~master ?
On 12/13/2012 10:37 AM, Noel Grandin wrote: On 2012-12-13 11:35, Stephan Bergmann wrote: In general, the online update mechanism spawns threads that it doesn't properly join again before exit, which is a notorious problem with tests (that often run quickly enough to terminate soffice.bin while the online update check is still in progress), Is it not possible to pass in a parameter disabling the online-update-check? That should make the tests happier. I have the faint memory that we indeed somehow disabled it at least for some of the tests in the past, but can't find any relevant code. (There's apparently no such command-line parameter for soffice, and the code at extensions/source/update/check/updatecheckjob.cxx also does not check any environment variable or similar.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: is 'make check' supposed to work on ~master ?
On 2012-12-13 11:53, Stephan Bergmann wrote: On 12/13/2012 10:37 AM, Noel Grandin wrote: On 2012-12-13 11:35, Stephan Bergmann wrote: In general, the online update mechanism spawns threads that it doesn't properly join again before exit, which is a notorious problem with tests (that often run quickly enough to terminate soffice.bin while the online update check is still in progress), Is it not possible to pass in a parameter disabling the online-update-check? That should make the tests happier. I have the faint memory that we indeed somehow disabled it at least for some of the tests in the past, but can't find any relevant code. (There's apparently no such command-line parameter for soffice, and the code at extensions/source/update/check/updatecheckjob.cxx also does not check any environment variable or similar.) Sounds like something I could log as a MediumHack? Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - oox/source
oox/source/vml/vmltextboxcontext.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 2c9e1123658c1448b8fe0b0e4295578ad1b183b0 Author: Miklos Vajna vmik...@suse.cz Date: Mon Dec 10 12:51:01 2012 +0100 oox: v:textbox's inset attribute should be imported in Hmm, not in Emu Trivial reproducer: http://people.freedesktop.org/~vmiklos/2012/simple-textbox.docx Change-Id: I030f7153326affc5a01e7ede1ddf1164fa500071 (cherry picked from commit 5bc835d48f1e5373b3a31bd166fadfdf19b3588f) diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx index 841c150..3f188e3 100644 --- a/oox/source/vml/vmltextboxcontext.cxx +++ b/oox/source/vml/vmltextboxcontext.cxx @@ -137,16 +137,16 @@ TextBoxContext::TextBoxContext( ContextHandler2Helper rParent, TextBox rTextBo OUString inset = rAttribs.getString( XML_inset ).get(); OUString value; ConversionHelper::separatePair( value, inset, inset, ',' ); -rTextBox.borderDistanceLeft = ConversionHelper::decodeMeasureToEmu( graphicHelper, +rTextBox.borderDistanceLeft = ConversionHelper::decodeMeasureToHmm( graphicHelper, value.isEmpty() ? 0.1in : value, 0, false, false ); ConversionHelper::separatePair( value, inset, inset, ',' ); -rTextBox.borderDistanceTop = ConversionHelper::decodeMeasureToEmu( graphicHelper, +rTextBox.borderDistanceTop = ConversionHelper::decodeMeasureToHmm( graphicHelper, value.isEmpty() ? 0.05in : value, 0, false, false ); ConversionHelper::separatePair( value, inset, inset, ',' ); -rTextBox.borderDistanceRight = ConversionHelper::decodeMeasureToEmu( graphicHelper, +rTextBox.borderDistanceRight = ConversionHelper::decodeMeasureToHmm( graphicHelper, value.isEmpty() ? 0.1in : value, 0, false, false ); ConversionHelper::separatePair( value, inset, inset, ',' ); -rTextBox.borderDistanceBottom = ConversionHelper::decodeMeasureToEmu( graphicHelper, +rTextBox.borderDistanceBottom = ConversionHelper::decodeMeasureToHmm( graphicHelper, value.isEmpty() ? 0.05in : value, 0, false, false ); rTextBox.borderDistanceSet = true; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: what's with Rectangle::GetHeight() and GetWidth() in gen.hxx
On 12/13/2012 10:48 AM, Noel Grandin wrote:
I seem to have triggered a problem on the windows tinderbox, but I'm
struggling to understand why.
The error on the tinderbox looks like:
[build LNK] Library/ires.lib
Creating library
C:/cygwin/home/tinderbox/master-build/workdir/wntmsci13.pro/LinkTarget/Library/iembobj.lib
and object
C:/cygwin/home/tinderbox/master-build/workdir/wntmsci13.pro/LinkTarget/Library/iembobj.exp
docholder.o : error LNK2019: unresolved external symbol
__declspec(dllimport) public: long __thiscall
Rectangle::GetHeight(void)const (__imp_?GetHeight@Rectangle@@QBEJXZ)
referenced in function
__catch$?GetDocFrame@DocumentHolder@@AAE?AV?$Reference@VXFrame@frame@star@sun@com@@@uno@star@sun@com@@XZ$0
And the definition in gen.hxx looks like:
class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Rectangle
{
public:
longGetWidth() const;
longGetHeight() const;
}
inline long Rectangle::GetWidth() const
{
.
}
Firstly, there seems to be a missing inline statement in the class
header section.
The inline in the declaration of Rectangle::GetHeight should not
strictly be necessary (though it would be good style anyway), but maybe
the TOOLS_DLLPUBLIC on the enclosing class definition does make it
relevant for MSC.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: is 'make check' supposed to work on ~master ?
On Thu, Dec 13, 2012 at 10:35 AM, Stephan Bergmann sberg...@redhat.com wrote: On 12/12/2012 06:36 PM, John Smith wrote: Im trying to run 'make check' at toplevel on ~master. It fails for me at this point (soffice.bin crashes) : make /usr/local/src/libreoffice/workdir/unxlngi6.pro/JunitTest/comphelper_complex/done Is that crash reproducible for you? The backtrace doesn't give much of a clue to why it fails, so if it is reproducible running under Valgrind might help. In general, the online update mechanism spawns threads that it doesn't properly join again before exit, which is a notorious problem with tests (that often run quickly enough to terminate soffice.bin while the online update check is still in progress), so I recommend to configure with --disable-online-update (which is the implicit default on Linux anyway, though). But the backtrace here doesn't look like it is caused by that problem anyway. It's pretty much reproducable for me: I re-tried make a few times. Ill retry with ./configure --disable-online-update make build make check, and see if it still fails. - John Smith ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Remove save to old Microsoft office formats
Hi Bryan, On Wed, 2012-12-12 at 18:05 -0500, Bryan Quigley wrote: This patch removes the ability to save to old office 6/95 formats. I've also opened a bug on it here: https://bugs.freedesktop.org/show_bug.cgi?id=53471 Wow - that's bold :-) indeed there are loads of problems with fidelity in the old formats, and of course maintenance pain testing uncertainty around them. Disabling them by default in the UI (with some setting to have them back on ?) might be better at least for a release - and lets see if anyone screams (?). I assume the root problem you want to fix is of users accidentally picking the wrong format in the filter / drop-down and getting a needlessly bad experience here ? Added to the ESC agenda for today anyhow ;-) It's a very trivial patch but: This contribution to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. This patch was also written before I joined Canonical. Great to have your contribution ! All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: offapi/type_reference registry/source
offapi/type_reference/update-rdb.sh |4 ++--
registry/source/registry.cxx|2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 53fbd30b3cd6465251b1b07f4728813d524fcd82
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 13 11:03:03 2012 +0100
Make registry's mergeKey fail if it cannot process regFileName
...so that regmerge fails for bad regfile arguments. Add -v to the regmerge
calls in update-rdb.sh so that an error message is printed in case of
failure.
Change-Id: I6613b9756b4e5628772541580938f6c80fd9bc9e
diff --git a/offapi/type_reference/update-rdb.sh
b/offapi/type_reference/update-rdb.sh
index 0f41721..79fd29c 100755
--- a/offapi/type_reference/update-rdb.sh
+++ b/offapi/type_reference/update-rdb.sh
@@ -24,10 +24,10 @@ fi
mkdir tmp
for i in $@; do
- ${OUTDIR_FOR_BUILD?}/bin/regmerge tmp/out1.rdb /UCR \
+ ${OUTDIR_FOR_BUILD?}/bin/regmerge -v tmp/out1.rdb /UCR \
${WORKDIR_FOR_BUILD?}/UnoApiPartTarget/${i%.idl}.urd
done
-${OUTDIR_FOR_BUILD?}/bin/regmerge tmp/out2.rdb / \
+${OUTDIR_FOR_BUILD?}/bin/regmerge -v tmp/out2.rdb / \
${SRC_ROOT?}/offapi/type_reference/types.rdb tmp/out1.rdb
echo sanity check diff:
diff (${OUTDIR_FOR_BUILD?}/bin/regview \
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index 5851199..345631a 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -361,7 +361,7 @@ static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg,
return _ret;
_ret = pReg-loadKey(pNewKey, regFileName, bWarnings, bReport);
-if (_ret == REG_MERGE_ERROR || (_ret == REG_MERGE_CONFLICT
bWarnings))
+if (_ret != REG_NO_ERROR (_ret != REG_MERGE_CONFLICT || bWarnings))
{
if (pNewKey != pKey)
(void) pKey-closeKey(pNewKey);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: when to backport
On 13/12/12 08:17, Michael Meeks wrote: ... Does that help ? Yes thanks Michael :-) Luke. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help with updating types.rdb
On 12/13/2012 09:41 AM, Lionel Elie Mamane wrote: On Wed, Dec 12, 2012 at 01:12:03PM -0500, Kohei Yoshida wrote: I'm trying to unpublish several UNO API as discussed in ESC meeting. I've done unpublishing but am struggling with updating the types.rdb. I'm running make cmd cmd='./types_reference/update-rdb.sh com/sun/star/sheet/DataPilotSource.idl (...) inside offapi directory, and I'm getting make: *** No rule to make target `cmd'. Stop. Running from the top-level directory seems to do *something* at least :) What's still missing is to adapt the path to the .idl file (i.e., add an offapi/ prefix). regmerge (even in verbose mode) unfortunately did not fail for input files that do not exist; that's changed now with http://cgit.freedesktop.org/libreoffice/core/commit/?id=53fbd30b3cd6465251b1b07f4728813d524fcd82 Make registry's mergeKey fail if it cannot process regFileName. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help with updating types.rdb
On 12/12/2012 07:12 PM, Kohei Yoshida wrote: I'm trying to unpublish several UNO API as discussed in ESC meeting. I've done unpublishing but am struggling with updating the types.rdb. [...] Help appreciated. Seeing that http://cgit.freedesktop.org/libreoffice/core/commit/?id=0315ef5bbc168896b1d7d8ac5c1657f861fa6a93 API CHANGE: unpublish Data Pilot interfaces contains changes to offapi/type_reference/types.rdb that amount to removing the published flag from certain interfaces and services, I assume that you managed to get that done after all? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: is 'make check' supposed to work on ~master ?
On 12/13/2012 11:00 AM, Noel Grandin wrote: On 2012-12-13 11:53, Stephan Bergmann wrote: On 12/13/2012 10:37 AM, Noel Grandin wrote: On 2012-12-13 11:35, Stephan Bergmann wrote: In general, the online update mechanism spawns threads that it doesn't properly join again before exit, which is a notorious problem with tests (that often run quickly enough to terminate soffice.bin while the online update check is still in progress), Is it not possible to pass in a parameter disabling the online-update-check? That should make the tests happier. I have the faint memory that we indeed somehow disabled it at least for some of the tests in the past, but can't find any relevant code. (There's apparently no such command-line parameter for soffice, and the code at extensions/source/update/check/updatecheckjob.cxx also does not check any environment variable or similar.) Sounds like something I could log as a MediumHack? Preferred hack would of course be to fix that online update code, but it looks like an opaque disaster at least to me... Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: SDK examples
On 12/12/2012 07:28 PM, Thorsten Behrens wrote: Stephan Bergmann wrote: Indeed it is, odk/examples/DevelopersGuide/Accessibility/. Looks like http://cgit.freedesktop.org/libreoffice/core/commit/?id=70626249cd247d9acdad417b8eaf252bae22c059 API CHANGE a11y unpublishing and add/removeListener rename. didn't address that. Sorry, after fiddling with this build system for a while - *how* are you building that, if at all?! Compiling the SDK examples? * cd install/sdk * ./setsdkenv_unix answer all its questions (it creates a ~/libreoffice*_sdk/ directory where it stores the information for subsequent invocations), it leaves you in a sub-shell with the necessary environment variable settings, so * cd examples/... make (Yes, all of that is ugly.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Calc saving csv-files
Hi Hannu, On Wed, 2012-12-12 at 10:36 +0200, Hannu Puhakka wrote: User get often shocking surprises saving csv-files. If the file is new, the system asks some questions, but saving old files again get more problems. As an attachment is an example. This is the developers list; are you going to hack on this problem ? if so this is the right place to discuss your patch / get some code pointers and more. If not - please file a bug - that is the best place to track your issue. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: desktop/source desktop/unx desktop/win32
desktop/source/app/officeipcthread.cxx | 40 +-
desktop/source/app/officeipcthread.hxx |2
desktop/unx/source/start.c | 17 -
desktop/win32/source/officeloader/officeloader.cxx | 60 -
4 files changed, 88 insertions(+), 31 deletions(-)
New commits:
commit 0dce7eae55bf90d2a7171a1fb8663d66ba4ac6d3
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Tue Nov 20 11:03:03 2012 +0100
startup: more reliable startup of multiple instances
Until now, when a new soffice instance (S2) started and tried to
connect to an existing soffice process (S1), S2 may have failed to
boostrap due to race condition in communication over the shared pipe.
S1 can be shutdown after S2 connected to it but _before_ S1 handled its
arguments (code run after 'accept' method in OfficeIPCThread).
This patch introduces a new message, sent by the main soffice after it
has called accept if and only if it's not shutting down (see mbDowning
member).
The other soffice waits for this message before enabling going in
PIPE_CONNECTED mode. If soffice fails to receive this message, pipe mode is
left unchanged and after a quick pause, it will try again.
Change-Id: I2e099a5804e1e8dd535cfd31ef454cffa44efa62
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 7047d69..7d477a7 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -57,6 +57,8 @@ const char *OfficeIPCThread::sc_aShowSequence = -tofront;
const int OfficeIPCThread::sc_nShSeqLength = 5;
const char *OfficeIPCThread::sc_aConfirmationSequence =
InternalIPC::ProcessingDone;
const int OfficeIPCThread::sc_nCSeqLength = 27;
+const char *OfficeIPCThread::sc_aSendArgumentsSequence =
InternalIPC::SendArguments;
+const int OfficeIPCThread::sc_nCSASeqLength = 26;
namespace { static char const ARGUMENT_PREFIX[] = InternalIPC::Arguments; }
@@ -497,8 +499,31 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread()
}
else if( pThread-maPipe.create( pThread-maPipeIdent.getStr(),
osl_Pipe_OPEN, rSecurity )) // Creation not successfull, now we try to connect
{
-// Pipe connected to first office
-nPipeMode = PIPEMODE_CONNECTED;
+osl::StreamPipe aStreamPipe(pThread-maPipe.getHandle());
+char pReceiveBuffer[sc_nCSASeqLength + 1];
+int nResult = 0;
+int nBytes = 0;
+int nBufSz = sc_nCSASeqLength + 1;
+// read byte per byte
+while ((nResult=aStreamPipe.recv( pReceiveBuffer+nBytes,
nBufSz-nBytes))0) {
+nBytes += nResult;
+if (pReceiveBuffer[nBytes-1]=='\0') {
+break;
+}
+}
+if (rtl::OString(sc_aSendArgumentsSequence).equals(pReceiveBuffer))
+{
+// Pipe connected to first office
+nPipeMode = PIPEMODE_CONNECTED;
+}
+else
+{
+// Pipe connection failed (other office exited or crashed)
+TimeValue tval;
+tval.Seconds = 0;
+tval.Nanosec = 5;
+salhelper::Thread::wait( tval );
+}
}
else
{
@@ -655,6 +680,17 @@ void OfficeIPCThread::execute()
// down during wait
osl::ClearableMutexGuard aGuard( GetMutex() );
+if (!mbDowning)
+{
+// notify client we're ready to process its args
+int nBytes = 0;
+int nResult = 0;
+while (
+(nResult =
maStreamPipe.send(sc_aSendArgumentsSequence+nBytes, sc_nCSASeqLength-nBytes))0
+((nBytes += nResult) sc_nCSASeqLength) ) ;
+}
+maStreamPipe.write(\0, 1);
+
// test byte by byte
const int nBufSz = 2048;
char pBuf[nBufSz];
diff --git a/desktop/source/app/officeipcthread.hxx
b/desktop/source/app/officeipcthread.hxx
index 734119d..3dd7eac 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -94,6 +94,8 @@ class OfficeIPCThread : public salhelper::Thread
static const int sc_nShSeqLength;
static const char *sc_aConfirmationSequence;
static const int sc_nCSeqLength;
+static const char *sc_aSendArgumentsSequence;
+static const int sc_nCSASeqLength;
OfficeIPCThread();
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 2d12d89..0e32c59 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -839,10 +839,19 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
if ( ( fd = connect_pipe(
[PUSHED] startup: more reliable startup of multiple instances
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1089 -- To view, visit https://gerrit.libreoffice.org/1089 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e099a5804e1e8dd535cfd31ef454cffa44efa62 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/rb1' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/rb1'
New branch 'feature/rb1' available with the following commits: commit f9edb3d7802ad38dff2cea2a90070548ceeb875e Author: Michael Meeks michael.me...@suse.com Date: Wed Dec 12 19:20:46 2012 + re-base on ALv2 code. Includes: Patch contributed by Oliver Rainer-Wittmann i#118572 - remove ui string and help content regarding usage of Java Mail in Writer's Mail Merge as Java Mail is not used. http://svn.apache.org/viewvc?view=revisionrevision=1197035 Patches contributed by Herbert Duerr updated help text for regexp word boundaries http://svn.apache.org/viewvc?view=revisionrevision=1228026 improved help text for word boundary regexp expression \b http://svn.apache.org/viewvc?view=revisionrevision=1234738 Patches contributed by Jurgen Schmidt remove onlineregistration with dependencies http://svn.apache.org/viewvc?view=revisionrevision=1240245 Patch contributed by Regina Henschel Extended tips for corner and cap style http://svn.apache.org/viewvc?view=revisionrevision=1242287 * re-enable on-line update help, remove obsolete on-line purchasing. commit 2700032f791ae80431ec7dc3429a963afa709fde Author: Michael Meeks michael.me...@suse.com Date: Thu Dec 13 10:12:36 2012 + Revert fdo#36057 time format using [] is needed to show hours non-modulo 24 This reverts commit 05e4e6345e7503b162356cfcff36a8787a34e05f. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - desktop/source desktop/unx desktop/win32
desktop/source/app/officeipcthread.cxx | 40 +-
desktop/source/app/officeipcthread.hxx |2
desktop/unx/source/start.c | 17 -
desktop/win32/source/officeloader/officeloader.cxx | 60 -
4 files changed, 88 insertions(+), 31 deletions(-)
New commits:
commit 8376da60d5d272cf6b3ebee91934bbcd970c7658
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Tue Nov 20 11:03:03 2012 +0100
startup: more reliable startup of multiple instances
Until now, when a new soffice instance (S2) started and tried to
connect to an existing soffice process (S1), S2 may have failed to
boostrap due to race condition in communication over the shared pipe.
S1 can be shutdown after S2 connected to it but _before_ S1 handled its
arguments (code run after 'accept' method in OfficeIPCThread).
This patch introduces a new message, sent by the main soffice after it
has called accept if and only if it's not shutting down (see mbDowning
member).
The other soffice waits for this message before enabling going in
PIPE_CONNECTED mode. If soffice fails to receive this message, pipe mode is
left unchanged and after a quick pause, it will try again.
Change-Id: I2e099a5804e1e8dd535cfd31ef454cffa44efa62
Signed-off-by: Stephan Bergmann sberg...@redhat.com
(cherry picked from commit 0dce7eae55bf90d2a7171a1fb8663d66ba4ac6d3)
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 7047d69..7d477a7 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -57,6 +57,8 @@ const char *OfficeIPCThread::sc_aShowSequence = -tofront;
const int OfficeIPCThread::sc_nShSeqLength = 5;
const char *OfficeIPCThread::sc_aConfirmationSequence =
InternalIPC::ProcessingDone;
const int OfficeIPCThread::sc_nCSeqLength = 27;
+const char *OfficeIPCThread::sc_aSendArgumentsSequence =
InternalIPC::SendArguments;
+const int OfficeIPCThread::sc_nCSASeqLength = 26;
namespace { static char const ARGUMENT_PREFIX[] = InternalIPC::Arguments; }
@@ -497,8 +499,31 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread()
}
else if( pThread-maPipe.create( pThread-maPipeIdent.getStr(),
osl_Pipe_OPEN, rSecurity )) // Creation not successfull, now we try to connect
{
-// Pipe connected to first office
-nPipeMode = PIPEMODE_CONNECTED;
+osl::StreamPipe aStreamPipe(pThread-maPipe.getHandle());
+char pReceiveBuffer[sc_nCSASeqLength + 1];
+int nResult = 0;
+int nBytes = 0;
+int nBufSz = sc_nCSASeqLength + 1;
+// read byte per byte
+while ((nResult=aStreamPipe.recv( pReceiveBuffer+nBytes,
nBufSz-nBytes))0) {
+nBytes += nResult;
+if (pReceiveBuffer[nBytes-1]=='\0') {
+break;
+}
+}
+if (rtl::OString(sc_aSendArgumentsSequence).equals(pReceiveBuffer))
+{
+// Pipe connected to first office
+nPipeMode = PIPEMODE_CONNECTED;
+}
+else
+{
+// Pipe connection failed (other office exited or crashed)
+TimeValue tval;
+tval.Seconds = 0;
+tval.Nanosec = 5;
+salhelper::Thread::wait( tval );
+}
}
else
{
@@ -655,6 +680,17 @@ void OfficeIPCThread::execute()
// down during wait
osl::ClearableMutexGuard aGuard( GetMutex() );
+if (!mbDowning)
+{
+// notify client we're ready to process its args
+int nBytes = 0;
+int nResult = 0;
+while (
+(nResult =
maStreamPipe.send(sc_aSendArgumentsSequence+nBytes, sc_nCSASeqLength-nBytes))0
+((nBytes += nResult) sc_nCSASeqLength) ) ;
+}
+maStreamPipe.write(\0, 1);
+
// test byte by byte
const int nBufSz = 2048;
char pBuf[nBufSz];
diff --git a/desktop/source/app/officeipcthread.hxx
b/desktop/source/app/officeipcthread.hxx
index 734119d..3dd7eac 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -94,6 +94,8 @@ class OfficeIPCThread : public salhelper::Thread
static const int sc_nShSeqLength;
static const char *sc_aConfirmationSequence;
static const int sc_nCSeqLength;
+static const char *sc_aSendArgumentsSequence;
+static const int sc_nCSASeqLength;
OfficeIPCThread();
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 2d12d89..0e32c59 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -839,10 +839,19 @@
[Libreoffice-commits] .: postprocess/packregistry
postprocess/packregistry/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 82c53d537a05dadf4d7fd7ea41292897bf2d47c7 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Dec 13 12:03:54 2012 +0100 Missing dependency (WriterWindowState.xcs is in writer.xcd) Change-Id: I4e6d7cea64afae21cfb00ca9dc7873c5ce90d2bc diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 3150607..f576a10 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -114,7 +114,7 @@ MY_FILES_impress = \ $(MY_MOD)/org/openoffice/Office/ProtocolHandler-impress.xcu \ $(MY_MOD)/org/openoffice/Setup-impress.xcu -MY_DEPS_librelogo = main +MY_DEPS_librelogo = main writer MY_FILES_librelogo = \ $(MY_MOD)/org/openoffice/Office/Addons-librelogo.xcu \ $(MY_MOD)/org/openoffice/Office/UI/WriterWindowState-librelogo.xcu ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Addin exceptions in SvStream
That's the problem... what we don't know can be hurting us big time. And since the tests are not very thorough, I can't have a good confidence that things are not broken. So, either we finish this patch and hope people will pick up those cases along the way - a risky proposal but it has the advantage of immunizing pretty much every filter for 'cheap'. Otherwise, I suggest that we go for a SvStream wrapper that throws exceptions - no changes to SvStream. It can be used wherever wanted, so that's a lot of engineering effort to bolt that in place - but less work than just putting stream-good() checks everywhere. Marc-André LAVERDIÈRE Perseverance must finish its work so that you may be mature and complete, not lacking anything. -James 1:4 http://asimplediscipleslife.blogspot.com/ mlaverd.theunixplace.com On Thu, Dec 13, 2012 at 4:40 AM, Michael Meeks michael.me...@suse.com wrote: Hi Marc, On Thu, 2012-12-13 at 02:09 -0500, Marc-André Laverdière wrote: I feel that this behavior of SvStream not to change the parameter in case of a broken stream should be changed. I am not sure why that is there. Well - it is -thought- (but hard to prove) that this behaviour is relied on by the code in a number of places: sal_uInt16 nFallbackStyleFoo = 0x; nStream nFallbackStyleFoo; And that nil'ing it - though attractive -might- then break things. Clever ideas to find and fix those few cases appreciated - but in general combining that with re-working to use explicit read functions seems like a good (albeit time-consuming) idea. Of course, it'd be possible to imagine a boolean on the stream to return defined data in these cases - but that's a bit sick IMHO ;-) if we have to audit the code and test it, why not clean it to use (much safer) readInt16(); style methods :-) HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 58142, which changed state. Bug 58142 Summary: EDITING: CRASH when copy paste multiple pictures from file explorer https://bugs.freedesktop.org/show_bug.cgi?id=58142 What|Removed |Added Status|UNCONFIRMED |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
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - sw/source
sw/source/core/layout/atrfrm.cxx |5 +
sw/source/core/layout/trvlfrm.cxx | 14 --
2 files changed, 13 insertions(+), 6 deletions(-)
New commits:
commit efa1a63d940c942c805f18696ce304aa47e04ef3
Author: Michael Stahl mst...@redhat.com
Date: Thu Dec 13 01:36:33 2012 +0100
SwFmtAnchor::SetAnchor(): assert that position is on SwTxtNode
Change-Id: I1c2a1cc2de4984cdcf1e5b8d0eafbd1471538e4a
(cherry picked from commit 90a0116ccb48388d91b21128fcac2e4609838581)
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index a59d2d2..f5d7798 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -98,6 +98,9 @@
#include svl/cjkoptions.hxx
#include switerator.hxx
#include pagedeschint.hxx
+#ifndef NDEBUG
+#include ndtxt.hxx
+#endif
using namespace ::com::sun::star;
using ::rtl::OUString;
@@ -1511,6 +1514,8 @@ SwFmtAnchor::~SwFmtAnchor()
void SwFmtAnchor::SetAnchor( const SwPosition *pPos )
{
+// anchor only to paragraphs
+assert(!pPos || dynamic_castSwTxtNode*(pPos-nNode.GetNode()));
m_pCntntAnchor .reset( (pPos) ? new SwPosition( *pPos ) : 0 );
// Flys anchored AT paragraph should not point into the paragraph content
if (m_pCntntAnchor
commit 2ab2046fe7d939be02649b1c69f571cb19f9aeaa
Author: Michael Stahl mst...@redhat.com
Date: Thu Dec 13 01:28:59 2012 +0100
fdo#58142: fix frame selection in SwPageFrm::GetCrsrOfst:
The function does not handle the case where a paragraph was hit but no
background frame was hit properly, which may or may not (depending on
the platform) cause it to return a position of a frame when that is
undesirable, such as when called from SwWrtShell::UnSelectFrm().
When UnselectFrm() leaves a frame selected pasting multiple pictures
leads to a crash.
(regression from e8fbe97900f13305b17015d9044993bde4adab36)
Change-Id: I3604825f654c523a37f47a9fc660647d8b3e7077
(cherry picked from commit 2fc4af311656e7d019ca802d23444e5161f820ee)
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index a70b08d..443af12 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -264,8 +264,12 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point
rPoint,
if ( ( bTestBackground bBackRet ) || !bTextRet )
{
bRet = bBackRet;
-pPos-nNode = aBackPos.nNode;
-pPos-nContent = aBackPos.nContent;
+(*pPos) = aBackPos;
+}
+else if (bTextRet !bBackRet)
+{
+bRet = bTextRet;
+(*pPos) = aTextPos;
}
else
{
@@ -306,14 +310,12 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point
rPoint,
if ( bValidTextDistance bValidBackDistance
basegfx::fTools::more( nTextDistance, nBackDistance ) )
{
bRet = bBackRet;
-pPos-nNode = aBackPos.nNode;
-pPos-nContent = aBackPos.nContent;
+(*pPos) = aBackPos;
}
else
{
bRet = bTextRet;
-pPos-nNode = aTextPos.nNode;
-pPos-nContent = aTextPos.nContent;
+(*pPos) = aTextPos;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - tools/inc
tools/inc/tools/gen.hxx | 80
1 file changed, 40 insertions(+), 40 deletions(-)
New commits:
commit 805ec83f188af51906a8d3a25ba9f5bc2e7f61c8
Author: Noel Grandin n...@peralex.com
Date: Thu Dec 13 13:39:18 2012 +0200
whitespace cleanup
Since I'm hacking in this file anyhow, make the class definition
a little prettier.
Change-Id: Id47f1084fe103e85cf1dacc84a9e536774767e61
diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx
index 568d873..1819a90 100644
--- a/tools/inc/tools/gen.hxx
+++ b/tools/inc/tools/gen.hxx
@@ -41,8 +41,8 @@ public:
long A() { return nA; }
long B() { return nB; }
-sal_Booloperator == ( const Pair rPair ) const;
-sal_Booloperator != ( const Pair rPair ) const;
+sal_Booloperator == ( const Pair rPair ) const;
+sal_Booloperator != ( const Pair rPair ) const;
TOOLS_DLLPUBLIC friend SvStreamoperator( SvStream rIStream, Pair
rPair );
TOOLS_DLLPUBLIC friend SvStreamoperator( SvStream rOStream, const
Pair rPair );
@@ -88,10 +88,10 @@ public:
long Y() { return nB; }
voidMove( long nHorzMove, long nVertMove );
-sal_BoolIsAbove( const Point rPoint ) const;
-sal_BoolIsBelow( const Point rPoint ) const;
-sal_BoolIsLeft( const Point rPoint ) const;
-sal_BoolIsRight( const Point rPoint ) const;
+sal_BoolIsAbove( const Point rPoint ) const;
+sal_BoolIsBelow( const Point rPoint ) const;
+sal_BoolIsLeft( const Point rPoint ) const;
+sal_BoolIsRight( const Point rPoint ) const;
Point operator += ( const Point rPoint );
Point operator -= ( const Point rPoint );
@@ -212,10 +212,10 @@ public:
long Width() { return nA; }
long Height() { return nB; }
-longgetWidth() const { return Width(); }
-longgetHeight() const { return Height(); }
-voidsetWidth(long nWidth) { Width() = nWidth; }
-voidsetHeight(long nHeight) { Height() = nHeight; }
+longgetWidth() const { return Width(); }
+longgetHeight() const { return Height(); }
+voidsetWidth(long nWidth) { Width() = nWidth; }
+voidsetHeight(long nHeight) { Height() = nHeight; }
};
inline Size::Size()
@@ -251,7 +251,7 @@ public:
long Min() { return nA; }
long Max() { return nB; }
-sal_BoolIsInside( long nIs ) const;
+sal_BoolIsInside( long nIs ) const;
voidJustify();
};
@@ -305,16 +305,16 @@ public:
long Min() { return nA; }
long Max() { return nB; }
-sal_BoolIsInside( long nIs ) const;
+sal_BoolIsInside( long nIs ) const;
voidJustify();
-sal_Booloperator !() const { return !Len(); }
+sal_Booloperator !() const { return !Len(); }
-longgetMin() const { return Min(); }
-longgetMax() const { return Max(); }
-voidsetMin(long nMin) { Min() = nMin; }
-voidsetMax(long nMax) { Max() = nMax; }
+longgetMin() const { return Min(); }
+longgetMax() const { return Max(); }
+voidsetMin(long nMin) { Min() = nMin; }
+voidsetMax(long nMax) { Max() = nMax; }
};
inline Selection::Selection()
commit c317b7f963f6d3fb2f325bc212c148d61b3dfa31
Author: Noel Grandin n...@peralex.com
Date: Thu Dec 13 13:36:57 2012 +0200
make the inline method attributes match with the method definition.
And make the whitespace layout a little cleaner.
Change-Id: I12b042600f061e74825de92ce836ee34ebdfabdb
diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx
index 2ddb21f..568d873 100644
--- a/tools/inc/tools/gen.hxx
+++ b/tools/inc/tools/gen.hxx
@@ -374,44 +374,44 @@ public:
long Top() { return nTop;}
long Bottom(){ return nBottom; }
-inline PointTopLeft() const;
-Point TopRight() const;
-Point TopCenter() const;
-Point BottomLeft() const;
-Point BottomRight() const;
-Point BottomCenter() const;
-Point LeftCenter() const;
-Point RightCenter() const;
-Point Center() const;
-
-voidMove( long nHorzMove, long nVertMove );
+inline PointTopLeft() const;
+inline PointTopRight() const;
+inline PointTopCenter() const;
+inline Point
[PATCH] Change in core[libreoffice-3-6]: fdo#58142: fix frame selection in SwPageFrm::GetCrsrOfst:
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1314 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/1314/1 fdo#58142: fix frame selection in SwPageFrm::GetCrsrOfst: The function does not handle the case where a paragraph was hit but no background frame was hit properly, which may or may not (depending on the platform) cause it to return a position of a frame when that is undesirable, such as when called from SwWrtShell::UnSelectFrm(). When UnselectFrm() leaves a frame selected pasting multiple pictures leads to a crash. (regression from e8fbe97900f13305b17015d9044993bde4adab36) Change-Id: I3604825f654c523a37f47a9fc660647d8b3e7077 (cherry picked from commit 2fc4af311656e7d019ca802d23444e5161f820ee) --- M sw/source/core/layout/trvlfrm.cxx 1 file changed, 8 insertions(+), 6 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1314 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3604825f654c523a37f47a9fc660647d8b3e7077 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Addin exceptions in SvStream
Hi Marc, On Thu, 2012-12-13 at 06:10 -0500, Marc-André Laverdière wrote: That's the problem... what we don't know can be hurting us big time. And since the tests are not very thorough, I can't have a good confidence that things are not broken. Of course. So, either we finish this patch and hope people will pick up those cases along the way - a risky proposal but it has the advantage of immunizing pretty much every filter for 'cheap'. and/or breaking it ? :-) Otherwise, I suggest that we go for a SvStream wrapper that throws exceptions - no changes to SvStream. It can be used wherever wanted, so that's a lot of engineering effort to bolt that in place - but less work than just putting stream-good() checks everywhere. AFAICS throwing an exception without going through and auditing each call-site will create even more pathalogical problems than just returning 0 - people who were careless (like they are) and routinely read over the end of some stream and then later checked will now throw an exception and fail to read the whole document - right ? :-) Personally, I don't see a clean solution beyond reading each of the call sites to those operators. If we want to take the risk of busting things - personally I'd prefer zeroing the data: it has a much lower risk/down-side as far as I can see. Then again - the ideal is clearly to do the work of code cleanup audit - that's fairly mindless busy-work that just needs to be done carefully. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - src/lib
src/lib/CDRDocument.cpp | 12 +++-
src/lib/CMXDocument.cpp |5 +
2 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 625677ba4ec9f0b0bb930fcefab5b7fc91b9bae8
Author: David Tardon dtar...@redhat.com
Date: Thu Dec 13 12:49:19 2012 +0100
coverity: do not let CDRDocument::parse throw
diff --git a/src/lib/CDRDocument.cpp b/src/lib/CDRDocument.cpp
index 4a75389..2633954 100644
--- a/src/lib/CDRDocument.cpp
+++ b/src/lib/CDRDocument.cpp
@@ -129,7 +129,17 @@ bool libcdr::CDRDocument::parse(::WPXInputStream *input,
libwpg::WPGPaintInterfa
{
input-seek(0, WPX_SEEK_SET);
bool retVal = false;
- unsigned version = getCDRVersion(input);
+ unsigned version = 0;
+ try
+ {
+version = getCDRVersion(input);
+ }
+ catch (libcdr::EndOfStreamException const)
+ {
+// This can only happen if isSupported() has not been called before
+return false;
+ }
+
if (version)
{
input-seek(0, WPX_SEEK_SET);
commit c21b18b668b9efc0dc14257e1e43a85c1ccea807
Author: David Tardon dtar...@redhat.com
Date: Thu Dec 13 12:13:14 2012 +0100
coverity: do not let CMXDocument::isSupported throw
diff --git a/src/lib/CMXDocument.cpp b/src/lib/CMXDocument.cpp
index 35d361d..9845552 100644
--- a/src/lib/CMXDocument.cpp
+++ b/src/lib/CMXDocument.cpp
@@ -45,6 +45,7 @@ Analyzes the content of an input stream to see if it can be
parsed
stream is a Corel Draw Document that libcdr is able to parse
*/
bool libcdr::CMXDocument::isSupported(WPXInputStream *input)
+try
{
input-seek(0, WPX_SEEK_SET);
unsigned riff = readU32(input);
@@ -62,6 +63,10 @@ bool libcdr::CMXDocument::isSupported(WPXInputStream *input)
return false;
return true;
}
+catch (...)
+{
+ return false;
+}
/**
Parses the input stream content. It will make callbacks to the functions
provided by a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Remove save to old Microsoft office formats
On Thu, 2012-12-13 at 10:05 +, Michael Meeks wrote: I assume the root problem you want to fix is of users accidentally picking the wrong format in the filter / drop-down and getting a needlessly bad experience here ? I seem to recall a bug (maybe fixed ?) where in the kde file dialog typing foo.doc as the save name would auto pick the word 6 format instead of the word 8 format. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Addin exceptions in SvStream
On Thu, 2012-12-13 at 09:40 +, Michael Meeks wrote:
Well - it is -thought- (but hard to prove) that this behaviour is
relied on by the code in a number of places:
I know of one (it could be the only one) place in
WW8ScannerBase::OpenPieceTable in sw/source/filter/ww8/ww8scan.cxx
while( 1 ) // Zaehle Zahl der Grpprls
{
sal_uInt8 clxt(2);
*pStr clxt;
if( 2 == clxt ) // PLCFfpcd ?
break; // PLCFfpcd gefunden
...
}
C.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: embeddedobj/Library_embobj.mk
embeddedobj/Library_embobj.mk |1 + 1 file changed, 1 insertion(+) New commits: commit ec89369f9f1c522c2c15fe1eaf6808f54233a4e3 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Dec 13 13:30:07 2012 +0100 link embedobj to tools library Usage introduced in dde234b6955a421d51d2b37e4fc3972c660146f0 and MSVC wants an external symbol even if the function is inline, for some reason. diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index 1fa1c5a..f3e1d51 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,embobj,\ cppuhelper \ sal \ vcl \ + tl \ $(gb_UWINAPI) \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: what's with Rectangle::GetHeight() and GetWidth() in gen.hxx
On Thursday 13 of December 2012, Noel Grandin wrote: Hi I seem to have triggered a problem on the windows tinderbox, but I'm struggling to understand why. The error on the tinderbox looks like: C:/cygwin/home/tinderbox/master-build/workdir/wntmsci13.pro/LinkTarget/Libr ary/iembobj.exp docholder.o : error LNK2019: unresolved external symbol __declspec(dllimport) public: long __thiscall Rectangle::GetHeight(void)const (__imp_?GetHeight@Rectangle@@QBEJXZ) referenced in function __catch$?GetDocFrame@DocumentHolder@@AAE?AV?$Reference@VXFrame@frame@star@s un@com@@@uno@star@sun@com@@XZ$0 Firstly, there seems to be a missing inline statement in the class header section. That's not needed actually. Secondly, given that there __is__ an inline modifier, why would the windows compiler be trying to link this function externally? The compiler is not required to inline, the keyword is just a hint. I'm not a Windows expert, but it looks like it is required on Windows to pass every used library to the link command, and this problem exists because embedobj does not link the tools library, and you've just introduced usage of it. I've pushed a fix for this. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 4 commits - oox/inc sal/qa solenv/gbuild sw/inc sw/Library_msword.mk sw/source writerfilter/inc xmloff/inc
oox/inc/oox/export/chartexport.hxx|1 sal/qa/osl/process/osl_Thread.cxx |3 solenv/gbuild/Helper.mk | 10 sw/Library_msword.mk |2 sw/inc/pch/precompiled_msword.cxx | 12 + sw/inc/pch/precompiled_msword.hxx | 257 ++ sw/inc/pch/precompiled_sw.hxx | 27 -- sw/source/filter/ww8/wrtw8esh.cxx |6 writerfilter/inc/pch/precompiled_writerfilter.hxx |1 xmloff/inc/pch/precompiled_xmloff.hxx |1 10 files changed, 285 insertions(+), 35 deletions(-) New commits: commit 481bc6cf3d8ab8b7f37c709bbe4e7f83b60ef8ec Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Dec 12 23:14:01 2012 +0100 substitute BUILDDIR in gb_Helper_abbreviate_dirs too diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index f81a6b4..25cf47f 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -38,12 +38,22 @@ gb_Helper_MISCDUMMY := $(gb_Helper_MISC)/DUMMY $(gb_Helper_MISCDUMMY) : @mkdir -p $(dir $@) touch $@ +ifeq ($(SRCDIR),$(BUILDDIR)) define gb_Helper_abbreviate_dirs S=$(SRCDIR) \ $(subst $(SRCDIR)/,$$S/,O=$(OUTDIR)) \ $(subst $(SRCDIR)/,$$S/,W=$(WORKDIR)) \ $(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(1 endef +else +define gb_Helper_abbreviate_dirs +S=$(SRCDIR) \ +$(subst $(SRCDIR)/,$$S/,B=$(BUILDDIR)) \ +$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,O=$(OUTDIR))) \ +$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,W=$(WORKDIR))) \ +$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(1) +endef +endif define gb_Helper_abbreviate_dirs_native $(call gb_Output_error,gb_Helper_abbreviate_dirs_native: use gb_Helper_abbreviate_dirs instead.) commit 40a0f91d63530959e04f7851e3390561780f9ad5 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Dec 12 23:12:33 2012 +0100 NOMINMAX on Windows is defined globally diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index 11214bd..3e394aa 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -18,9 +18,6 @@ */ #ifdef WNT -#if defined _MSC_VER -#define NOMINMAX -#endif #include windows.h #else #include unistd.h commit 4a4d3e08f6abb2bb20f8937e4d704d372bd0bd25 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Dec 12 18:12:42 2012 +0100 update PCH headers diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 777b491..991c412 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -34,7 +34,6 @@ #include boost/bind.hpp #include boost/foreach.hpp #include boost/ptr_container/ptr_set.hpp -#include boost/ptr_container/ptr_vector.hpp #include boost/scoped_array.hpp #include boost/scoped_ptr.hpp #include boost/shared_ptr.hpp @@ -58,7 +57,6 @@ #include comphelper/MasterPropertySetInfo.hxx #include comphelper/mediadescriptor.hxx #include comphelper/processfactory.hxx -#include comphelper/property.hxx #include comphelper/scoped_disposing_ptr.hxx #include comphelper/sequenceashashmap.hxx #include comphelper/sequenceasvector.hxx @@ -113,7 +111,6 @@ #include com/sun/star/beans/XPropertyState.hpp #include com/sun/star/beans/XPropertyStateChangeListener.hpp #include com/sun/star/container/XContainer.hpp -#include com/sun/star/container/XContainerListener.hpp #include com/sun/star/container/XChild.hpp #include com/sun/star/container/XIndexAccess.hpp #include com/sun/star/container/XIndexContainer.hpp @@ -244,10 +241,6 @@ #include com/sun/star/linguistic2/XProofreadingIterator.hpp #include com/sun/star/linguistic2/XSpellChecker1.hpp #include com/sun/star/linguistic2/XThesaurus.hpp -#include com/sun/star/mail/MailAttachment.hpp -#include com/sun/star/mail/MailServiceProvider.hpp -#include com/sun/star/mail/MailServiceType.hpp -#include com/sun/star/mail/XMailService.hpp #include com/sun/star/mail/XSmtpService.hpp #include com/sun/star/packages/WrongPasswordException.hpp #include com/sun/star/packages/zip/ZipIOException.hpp @@ -272,7 +265,6 @@ #include com/sun/star/script/XLibraryContainer.hpp #include com/sun/star/sdbc/DataType.hpp #include com/sun/star/sdb/CommandType.hpp -#include com/sun/star/sdbc/ResultSetType.hpp #include com/sun/star/sdbc/XConnection.hpp #include com/sun/star/sdbc/XDataSource.hpp #include com/sun/star/sdbc/XResultSet.hpp @@ -282,12 +274,7 @@ #include com/sun/star/sdbcx/XRowLocate.hpp #include com/sun/star/sdbcx/XTablesSupplier.hpp #include com/sun/star/sdb/DatabaseContext.hpp -#include com/sun/star/sdb/SQLContext.hpp -#include com/sun/star/sdb/XColumn.hpp -#include com/sun/star/sdb/XCompletedConnection.hpp -#include com/sun/star/sdb/XCompletedExecution.hpp #include com/sun/star/sdb/XDatabaseAccess.hpp -#include com/sun/star/sdb/XDocumentDataSource.hpp
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/com_MSC_defs.mk |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit b988f64d37f1e46fb5a9449758b379fc01661fa2 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Dec 12 17:48:52 2012 +0100 do not disable msvc warning 4005 And in fact make it an error with PCH, as there's it's very likely a PCH-specific problem. History refers to i76713 when introducing this, and that was something about .NET 2005, so this quite likely no longer applies. diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index e8d2f29..bea9b91 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -74,8 +74,6 @@ gb_AFLAGS := /c /Cp # cleaning away from the code, to avoid warnings when building with # gcc or Clang and -Wall -Werror. -# C4005: 'identifier' : macro redefinition - # C4127: conditional expression is constant # C4180: qualifier applied to function type has no meaning; ignored @@ -149,7 +147,6 @@ gb_CFLAGS := \ -MD \ -nologo \ -W4 \ - -wd4005 \ -wd4127 \ -wd4180 \ -wd4189 \ @@ -183,7 +180,6 @@ gb_CXXFLAGS := \ -MD \ -nologo \ -W4 \ - -wd4005 \ -wd4127 \ -wd4180 \ -wd4189 \ @@ -220,11 +216,14 @@ ifeq ($(VCVER),100) endif +# C4005: 'identifier' : macro redefinition + gb_PCHWARNINGS = \ -we4650 \ -we4651 \ -we4652 \ -we4653 \ + -we4005 \ gb_STDLIBS := \ advapi32.lib \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: what's with Rectangle::GetHeight() and GetWidth() in gen.hxx
On 2012-12-13 14:31, Lubos Lunak wrote: it. I've pushed a fix for this. Thanks. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: i18npool/inc i18npool/source
i18npool/inc/i18npool/lang.h|2 ++
i18npool/source/isolang/isolang.cxx |2 ++
2 files changed, 4 insertions(+)
New commits:
commit 09bc1464ec9dde61e69cca393e65e72143bdd383
Author: Eike Rathke er...@redhat.com
Date: Thu Dec 13 13:45:14 2012 +0100
introduced [mul] multiple and [und] undetermined language codes
Various places use an empty locale or string to indicate different
meanings and/or variants of this is not a real locale but I didn't know
what to use else or abuse LANGUAGE_DONTKNOW in one or the other way. In
preparation of changing that awkward situation now offer the ISO 639
codes for multiple languages [mul] and language undetermined [und],
mapping to LANGUAGE_MULTIPLE and LANGUAGE_UNDETERMINED.
Change-Id: I687de23ffc00a9a056f2837b024e0a62658e3df2
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index cf4ec6b..932f92b 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -566,6 +566,8 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_YOMBE 0x0684
#define LANGUAGE_USER_YOMBE_CONGO 0x8284 /* makeLangID( 0x20,
getPrimaryLanguage( LANGUAGE_USER_YOMBE)) */
#define LANGUAGE_USER_SIDAMA0x0685
+#define LANGUAGE_MULTIPLE 0xFFEF /* multiple languages,
primary 0x3ef, sub 0x3f */
+#define LANGUAGE_UNDETERMINED 0xFFF0 /* undetermined language,
primary 0x3f0, sub 0x3f */
#define LANGUAGE_USER_SYSTEM_CONFIG 0xFFFE /* not a locale, to be
used only in configuration context to obtain system default, primary 0x3fe, sub
0x3f */
#endif /* INCLUDED_I18NPOOL_LANG_H */
diff --git a/i18npool/source/isolang/isolang.cxx
b/i18npool/source/isolang/isolang.cxx
index 439590a..bbe3e0f 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -511,6 +511,8 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_YOMBE, yom, CD },
{ LANGUAGE_USER_YOMBE_CONGO, yom, CG },
{ LANGUAGE_USER_SIDAMA,sid, ET },
+{ LANGUAGE_MULTIPLE, mul,}, // multiple
languages, many languages are used
+{ LANGUAGE_UNDETERMINED, und,}, // undetermined
language, language cannot be identified
{ LANGUAGE_NONE, zxx,}, // added to ISO
639-2 on 2006-01-11: Used to declare the absence of linguistic information
{ LANGUAGE_DONTKNOW,, }// marks end of
table
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/unochart.hxx|2 -
sw/source/core/undo/rolbck.cxx | 14 +++
sw/source/core/undo/undel.cxx | 10 ++---
sw/source/core/undo/undobj.cxx |2 -
sw/source/core/undo/unmove.cxx |2 -
sw/source/core/undo/unovwr.cxx |2 -
sw/source/core/undo/untbl.cxx | 36 +-
sw/source/core/undo/untblk.cxx |2 -
sw/source/core/unocore/swunohelper.cxx |8 ++--
sw/source/core/unocore/unochart.cxx| 63 -
10 files changed, 71 insertions(+), 70 deletions(-)
New commits:
commit 20f2aaced1dabbd62ea516368b85e0e881d42165
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Dec 13 21:52:13 2012 +0900
sal_Bool to bool
Change-Id: I56e3889774b13fc040f72d576b8ea530bf31f9a5
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index fce97d2..e40ac8e 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -66,7 +66,7 @@ class SwFrmFmt;
//
-sal_Bool FillRangeDescriptor( SwRangeDescriptor rDesc, const String
rCellRangeName );
+bool FillRangeDescriptor( SwRangeDescriptor rDesc, const String
rCellRangeName );
//
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index a991a5e..10664f4 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -738,7 +738,7 @@ SwHistorySetAttrSet::SwHistorySetAttrSet( const SfxItemSet
rSet,
break;
pItem = aIter.NextItem();
pOrigItem = aOrigIter.NextItem();
-} while( sal_True );
+} while( true );
}
void SwHistorySetAttrSet::SetInDoc( SwDoc* pDoc, bool )
@@ -775,7 +775,7 @@ SwHistoryResetAttrSet::SwHistoryResetAttrSet( const
SfxItemSet rSet,
SfxItemIter aIter( rSet );
bool bAutoStyle = false;
-while( sal_True )
+while( true )
{
const sal_uInt16 nWhich = aIter.GetCurItem()-Which();
@@ -1195,7 +1195,7 @@ void SwHistory::CopyFmtAttr( const SfxItemSet rSet,
sal_uLong nNodeIdx )
if( aIter.IsAtEnd() )
break;
aIter.NextItem();
-} while( sal_True );
+} while( true );
}
}
@@ -1218,17 +1218,17 @@ void SwHistory::CopyAttr( SwpHints* pHts, sal_uLong
nNodeIdx,
break;
// never copy Flys and Ftn !!
-sal_Bool bNextAttr = sal_False;
+bool bNextAttr = false;
switch( pHt-Which() )
{
case RES_TXTATR_FIELD:
// no fields, ... copy ??
if( !bFields )
-bNextAttr = sal_True;
+bNextAttr = true;
break;
case RES_TXTATR_FLYCNT:
case RES_TXTATR_FTN:
-bNextAttr = sal_True;
+bNextAttr = true;
break;
}
@@ -1400,7 +1400,7 @@ void SwRegHistory::_MakeSetWhichIds()
{
SfxItemIter aIter( *pSet );
sal_uInt16 nW = aIter.FirstItem()-Which();
-while( sal_True )
+while( true )
{
m_WhichIdSet.insert( nW );
if( aIter.IsAtEnd() )
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index dc92233..9a53e8c 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -154,8 +154,8 @@ SwUndoDelete::SwUndoDelete( SwPaM rPam, sal_Bool
bFullPara, sal_Bool bCalledByT
: pEnd-nNode.GetNode().GetTxtNode();
}
-sal_Bool bMoveNds = *pStt == *pEnd // any area still existent?
-? sal_False
+bool bMoveNds = *pStt == *pEnd // any area still existent?
+? false
: ( SaveCntnt( pStt, pEnd, pSttTxtNd, pEndTxtNd ) ||
bFromTableCopy );
if( pSttTxtNd pEndTxtNd pSttTxtNd != pEndTxtNd )
@@ -342,7 +342,7 @@ sal_Bool SwUndoDelete::SaveCntnt( const SwPosition* pStt,
const SwPosition* pEnd
// 1 - copy start in Start-String
if( pSttTxtNd )
{
-sal_Bool bOneNode = nSttNode == nEndNode;
+bool bOneNode = nSttNode == nEndNode;
xub_StrLen nLen = bOneNode ? nEndCntnt - nSttCntnt
: pSttTxtNd-GetTxt().Len() - nSttCntnt;
SwRegHistory aRHst( *pSttTxtNd, pHistory );
@@ -467,7 +467,7 @@ sal_Bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const
SwPaM rDelPam )
if( !FillSaveData( rDelPam, *pTmpSav, sal_False ))
delete pTmpSav, pTmpSav = 0;
-sal_Bool bOk = ( !pRedlSaveData !pTmpSav ) ||
+bool bOk = ( !pRedlSaveData !pTmpSav ) ||
( pRedlSaveData pTmpSav
SwUndo::CanRedlineGroup( *pRedlSaveData, *pTmpSav, bBackSp ));
delete pTmpSav;
@@ -762,7 +762,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext
rContext)
else
pInsNd = 0; // do
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - i18npool/inc i18npool/source
i18npool/inc/i18npool/lang.h|2 ++
i18npool/source/isolang/isolang.cxx |2 ++
2 files changed, 4 insertions(+)
New commits:
commit ebcc02052d6fdfad59cdbcb4f18df0c007033999
Author: Eike Rathke er...@redhat.com
Date: Thu Dec 13 13:45:14 2012 +0100
introduced [mul] multiple and [und] undetermined language codes
Various places use an empty locale or string to indicate different
meanings and/or variants of this is not a real locale but I didn't know
what to use else or abuse LANGUAGE_DONTKNOW in one or the other way. In
preparation of changing that awkward situation now offer the ISO 639
codes for multiple languages [mul] and language undetermined [und],
mapping to LANGUAGE_MULTIPLE and LANGUAGE_UNDETERMINED.
Change-Id: I687de23ffc00a9a056f2837b024e0a62658e3df2
(cherry picked from commit 09bc1464ec9dde61e69cca393e65e72143bdd383)
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index cf4ec6b..932f92b 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -566,6 +566,8 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_YOMBE 0x0684
#define LANGUAGE_USER_YOMBE_CONGO 0x8284 /* makeLangID( 0x20,
getPrimaryLanguage( LANGUAGE_USER_YOMBE)) */
#define LANGUAGE_USER_SIDAMA0x0685
+#define LANGUAGE_MULTIPLE 0xFFEF /* multiple languages,
primary 0x3ef, sub 0x3f */
+#define LANGUAGE_UNDETERMINED 0xFFF0 /* undetermined language,
primary 0x3f0, sub 0x3f */
#define LANGUAGE_USER_SYSTEM_CONFIG 0xFFFE /* not a locale, to be
used only in configuration context to obtain system default, primary 0x3fe, sub
0x3f */
#endif /* INCLUDED_I18NPOOL_LANG_H */
diff --git a/i18npool/source/isolang/isolang.cxx
b/i18npool/source/isolang/isolang.cxx
index 439590a..bbe3e0f 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -511,6 +511,8 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_YOMBE, yom, CD },
{ LANGUAGE_USER_YOMBE_CONGO, yom, CG },
{ LANGUAGE_USER_SIDAMA,sid, ET },
+{ LANGUAGE_MULTIPLE, mul,}, // multiple
languages, many languages are used
+{ LANGUAGE_UNDETERMINED, und,}, // undetermined
language, language cannot be identified
{ LANGUAGE_NONE, zxx,}, // added to ISO
639-2 on 2006-01-11: Used to declare the absence of linguistic information
{ LANGUAGE_DONTKNOW,, }// marks end of
table
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Addin exceptions in SvStream
On Thursday 13 of December 2012, Michael Meeks wrote: Personally, I don't see a clean solution beyond reading each of the call sites to those operators. If we want to take the risk of busting things - personally I'd prefer zeroing the data: it has a much lower risk/down-side as far as I can see. Then again - the ideal is clearly to do the work of code cleanup audit - that's fairly mindless busy-work that just needs to be done carefully. I think it shouldn't be that difficult to write a Clang plugin that finds all uses of SvStream::operator/ , checks whether the variable read to is initalized [*] , and possibly it shouldn't be even that big deal to have it rewrite them to a series of SvStream::readInt32() etc. calls (i.e. EasyHack fdo#56110). I have not written yet any howto on plugins besides the examples under compilerplugins/, but if there would be interest, I could do something. [*] Or, since I assume all those variables have been needlessly initialized just in attempt to silence the broken warning with the wretched gcc thing on Apple, the check will need to be more complicated and find if the initializer is not the default value for the type. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3f390ae06bc960b85ee52d0df1ebe6e84358aafa Author: Michael Meeks michael.me...@suse.com Date: Wed Dec 12 19:20:46 2012 + Updated core Project: help df4d4db7408ed3fc135eded6787bad80853619fd re-base on ALv2 code. Includes: diff --git a/helpcontent2 b/helpcontent2 index 56562e9..df4d4db 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 56562e9b04dcbfd63012eecddb53b76dc4cee84b +Subproject commit df4d4db7408ed3fc135eded6787bad80853619fd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/source
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 111 +--
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx |2
2 files changed, 56 insertions(+), 57 deletions(-)
New commits:
commit 3d5789d48d6602832abd33268e31afa4080cb87a
Author: Ricardo Montania rica...@linuxafundo.com.br
Date: Wed Dec 12 13:26:57 2012 -0200
String removal in filter
Change-Id: I170d132e9329dd58ed6dc9bbf4094c234d122592
Reviewed-on: https://gerrit.libreoffice.org/1309
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index edf23e1..29c5d55 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -52,7 +52,6 @@ using namespace com::sun::star::container;
using namespace com::sun::star::beans;
using namespace com::sun::star::util;
-using ::rtl::OUString;
using ::rtl::Uri;
XMLFilterSettingsDialog::XMLFilterSettingsDialog(Window* pParent,
@@ -90,11 +89,11 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog(Window*
pParent,
try
{
-mxFilterContainer = Reference XNameContainer ::query(
rxMSF-createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.document.FilterFactory )) ) );
-mxTypeDetection = Reference XNameContainer ::query(
rxMSF-createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.document.TypeDetection )) ));
-mxExtendedTypeDetection = Reference XNameContainer ::query(
rxMSF-createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.document.ExtendedTypeDetectionFactory )) ) );
+mxFilterContainer = Reference XNameContainer ::query(
rxMSF-createInstance( com.sun.star.document.FilterFactory ) );
+mxTypeDetection = Reference XNameContainer ::query(
rxMSF-createInstance( com.sun.star.document.TypeDetection ) );
+mxExtendedTypeDetection = Reference XNameContainer ::query(
rxMSF-createInstance( com.sun.star.document.ExtendedTypeDetectionFactory ) );
-Reference XConfigManager xCfgMgr( mxMSF-createInstance(OUString(
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.config.SpecialConfigManager )) ),
UNO_QUERY );
+Reference XConfigManager xCfgMgr( mxMSF-createInstance(
com.sun.star.config.SpecialConfigManager ), UNO_QUERY );
if( xCfgMgr.is() )
{
m_sTemplatePath = xCfgMgr-substituteVariables( m_sTemplatePath );
@@ -198,7 +197,7 @@ void XMLFilterSettingsDialog::updateStates()
sal_Int32 nFact = SvtModuleOptions::E_WRITER;
while(nFact = SvtModuleOptions::E_BASIC)
{
-::rtl::OUString sDefault =
maModuleOpt.GetFactoryDefaultFilter((SvtModuleOptions::EFactory)nFact);
+OUString sDefault =
maModuleOpt.GetFactoryDefaultFilter((SvtModuleOptions::EFactory)nFact);
if( sDefault == pInfo-maFilterName )
{
bIsDefault = true;
@@ -224,14 +223,14 @@ void XMLFilterSettingsDialog::onNew()
aTempInfo.maFilterName =
createUniqueFilterName(RESIDSTR(STR_DEFAULT_FILTER_NAME));
// init default extension
-String aDefaultExtension(RESIDSTR(STR_DEFAULT_EXTENSION));
+OUString aDefaultExtension(RESIDSTR(STR_DEFAULT_EXTENSION));
aTempInfo.maExtension = aDefaultExtension;
// set default ui name
aTempInfo.maInterfaceName =
createUniqueInterfaceName(RESIDSTR(STR_DEFAULT_UI_NAME));
// set default application
-aTempInfo.maDocumentService = OUString( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.text.TextDocument ));
+aTempInfo.maDocumentService = com.sun.star.text.TextDocument;
// execute XML Filter Dialog
XMLFilterTabDialog aDlg( this, *getXSLTDialogResMgr(), mxMSF, aTempInfo );
@@ -273,7 +272,7 @@ void XMLFilterSettingsDialog::onEdit()
/** helper to create a sequence of strings from an extensions strings
ext1;ext2;ext3 will become { ext1, ext2, ext3 } */
-static Sequence OUString createExtensionsSequence( const rtl::OUString
rExtensions )
+static Sequence OUString createExtensionsSequence( const OUString
rExtensions )
{
// first count how many extensions we have inside the string
int nExtensions = 0;
@@ -419,7 +418,7 @@ OUString
XMLFilterSettingsDialog::createUniqueInterfaceName( const OUString rIn
if( nDefaultNumber )
{
aInterfaceName += OUString( sal_Unicode( ' ' ) );
-aInterfaceName += String::CreateFromInt32( nDefaultNumber );
+aInterfaceName += OUString::valueOf(
static_castsal_Int32(nDefaultNumber) );
}
return aInterfaceName;
@@ -540,28 +539,28 @@ bool XMLFilterSettingsDialog::insertOrEdit(
filter_info_impl* pNewInfo, const fi
// 3. create property values for filter entry
Sequence PropertyValue aFilterData( 8 );
-aFilterData[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( Type )
[PUSHED] String removal in filter
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1309 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1309 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I170d132e9329dd58ed6dc9bbf4094c234d122592 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Remove save to old Microsoft office formats
On Thursday 13 of December 2012, Caolán McNamara wrote: On Thu, 2012-12-13 at 10:05 +, Michael Meeks wrote: I assume the root problem you want to fix is of users accidentally picking the wrong format in the filter / drop-down and getting a needlessly bad experience here ? I seem to recall a bug (maybe fixed ?) where in the kde file dialog typing foo.doc as the save name would auto pick the word 6 format instead of the word 8 format. Definitely fixed. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sw/source
sw/source/core/doc/notxtfrm.cxx |2
sw/source/core/inc/cellfrm.hxx|2
sw/source/core/inc/flyfrm.hxx |2
sw/source/core/inc/frame.hxx |2
sw/source/core/inc/layfrm.hxx |2
sw/source/core/inc/notxtfrm.hxx |2
sw/source/core/inc/pagefrm.hxx|2
sw/source/core/inc/rootfrm.hxx|2
sw/source/core/inc/txtfrm.hxx |2
sw/source/core/layout/trvlfrm.cxx | 96 ++
sw/source/core/layout/unusedf.cxx |2
sw/source/core/text/frmcrsr.cxx |2
12 files changed, 77 insertions(+), 41 deletions(-)
New commits:
commit b3dadcc1f542d406f8cb8c59c57ae34b2de9fe22
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Fri Nov 23 17:51:16 2012 +0100
fdo#52182: Fixed click in frames located in header/footer
Using a distance to click to select the best object to select between
normal text and background object.
(cherry picked from commit e8fbe97900f13305b17015d9044993bde4adab36)
Conflicts:
sw/source/ui/docvw/edtwin.cxx
sw/source/ui/inc/edtwin.hxx
Change-Id: Ib5b53161c7af2c16f4df379382f2e53fc6d8092b
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index d3ca641..f116e11 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -609,7 +609,7 @@ sal_Bool SwNoTxtFrm::GetCharRect( SwRect rRect, const
SwPosition rPos,
sal_Bool SwNoTxtFrm::GetCrsrOfst(SwPosition* pPos, Point ,
- SwCrsrMoveState* ) const
+ SwCrsrMoveState*, bool ) const
{
SwCntntNode* pCNd = (SwCntntNode*)GetNode();
pPos-nNode = *pCNd;
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx
index 0bc62ae..958806e 100644
--- a/sw/source/core/inc/cellfrm.hxx
+++ b/sw/source/core/inc/cellfrm.hxx
@@ -48,7 +48,7 @@ public:
SwCellFrm( const SwTableBox , SwFrm*, bool bInsertContent = true );
~SwCellFrm();
-virtual sal_Bool GetCrsrOfst( SwPosition *, Point, SwCrsrMoveState* = 0 )
const;
+virtual sal_Bool GetCrsrOfst( SwPosition *, Point, SwCrsrMoveState* = 0,
bool bTestBackground = false ) const;
virtual void Paint( SwRect const,
SwPrintData const*const pPrintData = NULL ) const;
virtual void CheckDirection( sal_Bool bVert );
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 170064e..635451b 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -163,7 +163,7 @@ public:
SwPrintData const*const pPrintData = NULL ) const;
virtual Size ChgSize( const Size aNewSize );
virtual sal_Bool GetCrsrOfst( SwPosition *, Point,
- SwCrsrMoveState* = 0 ) const;
+ SwCrsrMoveState* = 0, bool bTestBackground =
false ) const;
virtual void CheckDirection( sal_Bool bVert );
virtual void Cut();
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index e2213cf..729d358 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -786,7 +786,7 @@ public:
virtual boolFillSelection( SwSelectionList rList, const SwRect rRect
) const;
virtual sal_BoolGetCrsrOfst( SwPosition *, Point,
- SwCrsrMoveState* = 0 ) const;
+ SwCrsrMoveState* = 0, bool bTestBackground =
false ) const;
virtual sal_BoolGetCharRect( SwRect , const SwPosition,
SwCrsrMoveState* = 0 ) const;
virtual void Paint( SwRect const,
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 4c4e4e6..a8d4bc4 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -92,7 +92,7 @@ public:
virtual boolFillSelection( SwSelectionList rList, const SwRect rRect
) const;
virtual sal_Bool GetCrsrOfst( SwPosition *, Point,
- SwCrsrMoveState* = 0 ) const;
+ SwCrsrMoveState* = 0, bool bTestBackground =
false ) const;
virtual void Cut();
virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index 17494b0..f8c1033 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -61,7 +61,7 @@ public:
virtual sal_Bool GetCharRect( SwRect , const SwPosition,
SwCrsrMoveState* = 0) const;
sal_Bool GetCrsrOfst(SwPosition* pPos, Point aPoint,
- SwCrsrMoveState* = 0) const;
+ SwCrsrMoveState* = 0, bool bTestBackground = false) const;
const Size GetGrfSize() const { return GetSize(); }
void GetGrfArea( SwRect rRect, SwRect * = 0, sal_Bool bMirror = sal_True
) const;
[Libreoffice-commits] .: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UI_swriter.mk
sw/AllLangResTarget_sw.mk|1
sw/UI_swriter.mk |1
sw/inc/globals.hrc |2
sw/inc/helpid.h |1
sw/source/ui/app/app.src |2
sw/source/ui/frmdlg/cption.cxx | 83 ++-
sw/source/ui/frmdlg/cption.hrc | 48
sw/source/ui/frmdlg/cption.src | 152 -
sw/uiconfig/swriter/ui/captionoptions.ui | 360 +++
9 files changed, 395 insertions(+), 255 deletions(-)
New commits:
commit f82b7a2aea7bcbc6dca13fc251b11685d62b8380
Author: Jack Leigh leigh...@gmx.se
Date: Wed Dec 12 21:58:17 2012 +
migrate 'Caption options' dialog to .ui file
Change-Id: I58dbb70faf22c5958b65e5192664b7d12d62f04c
Reviewed-on: https://gerrit.libreoffice.org/1312
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index ea1196b..d80bfbc 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -131,7 +131,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/fldui/inpdlg.src \
sw/source/ui/fmtui/tmpdlg.src \
sw/source/ui/frmdlg/column.src \
-sw/source/ui/frmdlg/cption.src \
sw/source/ui/frmdlg/frmpage.src \
sw/source/ui/frmdlg/frmui.src \
sw/source/ui/frmdlg/wrap.src \
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index f39bb2f..9da10bf 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UI_UI,modules/swriter))
$(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/autoformattable \
sw/uiconfig/swriter/ui/bibliographyentry \
+ sw/uiconfig/swriter/ui/captionoptions \
sw/uiconfig/swriter/ui/charurlpage \
sw/uiconfig/swriter/ui/columnwidth \
sw/uiconfig/swriter/ui/converttexttable \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 5362aee..1b79466 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -73,7 +73,7 @@
#define STR_CAPTION_END (RC_GLOBALS_BEGIN + 43)
#define STR_CAPTION_ABOVE (RC_GLOBALS_BEGIN + 44)
#define STR_CAPTION_BELOW (RC_GLOBALS_BEGIN + 45)
-#define STR_CAPTION_CATEGORY_NONE (RC_GLOBALS_BEGIN + 46)
+#define STR_CAPTION_NONE(RC_GLOBALS_BEGIN + 46)
// DIALOGS ---
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 917d9de..d443b6d 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -132,7 +132,6 @@
#define HID_SW_SORT_POSITION
SW_HID_SW_SORT_POSITION
#define HID_SYNC_BTN
SW_HID_SYNC_BTN
#define HID_EDIT_COMMENT
SW_HID_EDIT_COMMENT
-#define HID_DLG_SEQUENCE_OPTION
SW_HID_DLG_SEQUENCE_OPTION
#define HID_DLG_FLDEDT_NEXT
SW_HID_DLG_FLDEDT_NEXT
#define HID_DLG_FLDEDT_PREV
SW_HID_DLG_FLDEDT_PREV
#define HID_DLG_FLDEDT_ADDRESS
SW_HID_DLG_FLDEDT_ADDRESS
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 9111d94..0239ddf 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -256,7 +256,7 @@ String STR_CAPTION_BELOW
{
Text [ en-US ] = Below ;
};
-String STR_CAPTION_CATEGORY_NONE
+String STR_CAPTION_NONE
{
Text [ en-US ] = None ;
};
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 404b36d..3585ded 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -44,7 +44,6 @@
#include comphelper/string.hxx
#include frmui.hrc
#include globals.hrc
-#include cption.hrc
#include SwStyleNameMapper.hxx
using namespace ::com::sun::star;
@@ -56,25 +55,14 @@ extern String* GetOldDrwCat();
class SwSequenceOptionDialog : public SvxStandardDialog
{
-FixedLine aFlHeader;
-FixedText aFtLevel;
-ListBox aLbLevel;
-FixedText aFtDelim;
-EditaEdDelim;
+ListBox*m_pLbLevel;
+Edit* m_pEdDelim;
-FixedLine aFlCatAndFrame;
-FixedText aFtCharStyle;
-ListBox aLbCharStyle;
-CheckBoxaApplyBorderAndShadowCB;
+ListBox*m_pLbCharStyle;
+CheckBox* m_pApplyBorderAndShadowCB;
//#i61007# order of captions
-FixedLine aFlCaptionOrder;
-FixedText aFtCaptionOrder;
-ListBox aLbCaptionOrder;
-
-OKButtonaOKButton;
-CancelButtonaCancelButton;
-HelpButton aHelpButton;
+ListBox*m_pLbCaptionOrder;
SwView rView;
String aFldTypeName;
@@ -85,12 +73,12 @@ public:
virtual ~SwSequenceOptionDialog();
virtual void Apply();
[PUSHED] migrate 'Caption options' dialog to .ui file
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1312 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1312 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I58dbb70faf22c5958b65e5192664b7d12d62f04c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jack Leigh leigh...@gmx.se Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 62cde8eded955de1164c6c9b347cab21c35963af Author: Michael Meeks michael.me...@suse.com Date: Wed Dec 12 19:20:46 2012 + Updated core Project: help 32c4964e1415547af5dd956b590dc0edb3d10778 re-base on ALv2 code. Includes: diff --git a/helpcontent2 b/helpcontent2 index d9d28eb..32c4964 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d9d28ebb575e96e742d6590a28dd59c62b89dc4e +Subproject commit 32c4964e1415547af5dd956b590dc0edb3d10778 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - sfx2/inc sfx2/source svl/source
sfx2/inc/sfx2/templateabstractview.hxx| 13 +
sfx2/inc/sfx2/templatelocalview.hxx |2
sfx2/inc/sfx2/templateremoteview.hxx |7 -
sfx2/inc/sfx2/templateview.hxx| 22 ---
sfx2/inc/sfx2/thumbnailview.hxx | 12 -
sfx2/inc/sfx2/thumbnailviewitem.hxx |1
sfx2/inc/templatedlg.hxx |4
sfx2/source/control/templateabstractview.cxx | 19 ++
sfx2/source/control/templatelocalview.cxx | 27
sfx2/source/control/templatelocalviewitem.cxx |6
sfx2/source/control/templateremoteview.cxx| 27
sfx2/source/control/templateview.cxx | 175 ++
sfx2/source/control/templateview.hrc |4
sfx2/source/control/templateview.src | 22 ++-
sfx2/source/control/templateviewitem.cxx |6
sfx2/source/control/thumbnailview.cxx | 37 -
sfx2/source/doc/templatedlg.cxx | 119 -
sfx2/source/doc/templatedlg.src |1
svl/source/misc/inettype.cxx | 19 +-
19 files changed, 140 insertions(+), 383 deletions(-)
New commits:
commit cc9329c52c8327f0d8b52162755959bac9364265
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Dec 13 14:53:01 2012 +0100
Bad compareToIgnoreAsciiCaseAscii result comparison caused endless loop
Change-Id: I6ef5aa87623a0d61942183b7eb888fc0f9cf6af0
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index 143a11a..d5f01f6 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -643,19 +643,14 @@ MediaTypeEntry const * seekEntry(OUString const
rTypeName,
{
sal_Size nMiddle = (nLow + nHigh) / 2;
MediaTypeEntry const * pEntry = pMap + nMiddle;
-switch (rTypeName.compareToIgnoreAsciiCaseAscii(pEntry-m_pTypeName))
-{
-case COMPARE_LESS:
-nHigh = nMiddle;
-break;
-
-case COMPARE_EQUAL:
-return pEntry;
+sal_Int32 nCmp =
rTypeName.compareToIgnoreAsciiCaseAscii(pEntry-m_pTypeName);
+if (nCmp 0)
+nHigh = nMiddle;
+else if (nCmp == 0)
+return pEntry;
-case COMPARE_GREATER:
-nLow = nMiddle + 1;
-break;
-}
+else
+nLow = nMiddle + 1;
}
return 0;
}
commit 8f54315f716ab37331caf80d4cf3d5aeacc78644
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Dec 13 14:29:52 2012 +0100
Template Manager: make it sizeable
Change-Id: I14d3c73b714b9cbfefad7adcb02efb790c8a1e5b
diff --git a/sfx2/inc/sfx2/templateabstractview.hxx
b/sfx2/inc/sfx2/templateabstractview.hxx
index d1e4b14..a86ced0 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++ b/sfx2/inc/sfx2/templateabstractview.hxx
@@ -117,10 +117,10 @@ public:
static BitmapEx fetchThumbnail (const OUString msURL, long width, long
height);
-protected:
-
virtual void Resize();
+protected:
+
virtual void Paint( const Rectangle rRect );
virtual void DrawItem (ThumbnailViewItem *pItem);
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 6d3a4c2..9548bd1 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -236,6 +236,8 @@ public:
void setItemStateHdl (const Link aLink) { maItemStateHdl = aLink; }
+virtual void Resize();
+
protected:
virtual void MouseButtonDown( const MouseEvent rMEvt );
@@ -250,8 +252,6 @@ protected:
virtual void LoseFocus();
-virtual void Resize();
-
virtual void StateChanged( StateChangedType nStateChange );
virtual void DataChanged( const DataChangedEvent rDCEvt );
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index f24c8e4..3f7ba13 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -52,6 +52,8 @@ private:
virtual void MouseButtonDown( const MouseEvent rMEvt );
+virtual void Resize ();
+
DECL_LINK(CloseOverlayHdl, void*);
DECL_LINK(TBXViewHdl, void*);
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index 02c61b0..2caeba3 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -275,6 +275,7 @@ BitmapEx TemplateAbstractView::fetchThumbnail (const
OUString msURL, long width
void TemplateAbstractView::Resize()
{
mpItemView-SetSizePixel(GetSizePixel());
+ThumbnailView::Resize();
}
void TemplateAbstractView::Paint(const Rectangle rRect)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 1d0512e..3546826 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -122,32 +122,6 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window
*parent)
Re: Help with updating types.rdb
On 12/13/2012 05:15 AM, Stephan Bergmann wrote: On 12/12/2012 07:12 PM, Kohei Yoshida wrote: I'm trying to unpublish several UNO API as discussed in ESC meeting. I've done unpublishing but am struggling with updating the types.rdb. [...] Help appreciated. Seeing that http://cgit.freedesktop.org/libreoffice/core/commit/?id=0315ef5bbc168896b1d7d8ac5c1657f861fa6a93 API CHANGE: unpublish Data Pilot interfaces contains changes to offapi/type_reference/types.rdb that amount to removing the published flag from certain interfaces and services, I assume that you managed to get that done after all? Well, in the end Michael Stahl picked it up for me (the types.rdb part). I remained unsuccessful until the end. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 5 commits - sfx2/inc sfx2/source svl/source
sfx2/inc/sfx2/templateabstractview.hxx| 13 +
sfx2/inc/sfx2/templatelocalview.hxx |2
sfx2/inc/sfx2/templateremoteview.hxx |7 -
sfx2/inc/sfx2/templateview.hxx| 22 ---
sfx2/inc/sfx2/thumbnailview.hxx | 12 -
sfx2/inc/sfx2/thumbnailviewitem.hxx |1
sfx2/inc/templatedlg.hxx |4
sfx2/source/control/templateabstractview.cxx | 19 ++
sfx2/source/control/templatelocalview.cxx | 27
sfx2/source/control/templatelocalviewitem.cxx |6
sfx2/source/control/templateremoteview.cxx| 27
sfx2/source/control/templateview.cxx | 175 ++
sfx2/source/control/templateview.hrc |4
sfx2/source/control/templateview.src | 22 ++-
sfx2/source/control/templateviewitem.cxx |6
sfx2/source/control/thumbnailview.cxx | 37 -
sfx2/source/doc/templatedlg.cxx | 119 -
sfx2/source/doc/templatedlg.src |1
svl/source/misc/inettype.cxx | 19 +-
19 files changed, 140 insertions(+), 383 deletions(-)
New commits:
commit c69399e5a12cd4e63efc7280c8470b514ab2f453
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Dec 13 14:53:01 2012 +0100
Bad compareToIgnoreAsciiCaseAscii result comparison caused endless loop
Change-Id: I6ef5aa87623a0d61942183b7eb888fc0f9cf6af0
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index 143a11a..d5f01f6 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -643,19 +643,14 @@ MediaTypeEntry const * seekEntry(OUString const
rTypeName,
{
sal_Size nMiddle = (nLow + nHigh) / 2;
MediaTypeEntry const * pEntry = pMap + nMiddle;
-switch (rTypeName.compareToIgnoreAsciiCaseAscii(pEntry-m_pTypeName))
-{
-case COMPARE_LESS:
-nHigh = nMiddle;
-break;
-
-case COMPARE_EQUAL:
-return pEntry;
+sal_Int32 nCmp =
rTypeName.compareToIgnoreAsciiCaseAscii(pEntry-m_pTypeName);
+if (nCmp 0)
+nHigh = nMiddle;
+else if (nCmp == 0)
+return pEntry;
-case COMPARE_GREATER:
-nLow = nMiddle + 1;
-break;
-}
+else
+nLow = nMiddle + 1;
}
return 0;
}
commit bd6b9414e7914a50d24db5b37ebefb831eabec79
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Dec 13 14:29:52 2012 +0100
Template Manager: make it sizeable
Change-Id: I14d3c73b714b9cbfefad7adcb02efb790c8a1e5b
diff --git a/sfx2/inc/sfx2/templateabstractview.hxx
b/sfx2/inc/sfx2/templateabstractview.hxx
index d1e4b14..a86ced0 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++ b/sfx2/inc/sfx2/templateabstractview.hxx
@@ -117,10 +117,10 @@ public:
static BitmapEx fetchThumbnail (const OUString msURL, long width, long
height);
-protected:
-
virtual void Resize();
+protected:
+
virtual void Paint( const Rectangle rRect );
virtual void DrawItem (ThumbnailViewItem *pItem);
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 6d3a4c2..9548bd1 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -236,6 +236,8 @@ public:
void setItemStateHdl (const Link aLink) { maItemStateHdl = aLink; }
+virtual void Resize();
+
protected:
virtual void MouseButtonDown( const MouseEvent rMEvt );
@@ -250,8 +252,6 @@ protected:
virtual void LoseFocus();
-virtual void Resize();
-
virtual void StateChanged( StateChangedType nStateChange );
virtual void DataChanged( const DataChangedEvent rDCEvt );
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index f24c8e4..3f7ba13 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -52,6 +52,8 @@ private:
virtual void MouseButtonDown( const MouseEvent rMEvt );
+virtual void Resize ();
+
DECL_LINK(CloseOverlayHdl, void*);
DECL_LINK(TBXViewHdl, void*);
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index ae9e958..b66c3c9 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -282,6 +282,7 @@ BitmapEx TemplateAbstractView::fetchThumbnail (const
OUString msURL, long width
void TemplateAbstractView::Resize()
{
mpItemView-SetSizePixel(GetSizePixel());
+ThumbnailView::Resize();
}
void TemplateAbstractView::Paint(const Rectangle rRect)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 1d0512e..3546826 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -122,32 +122,6 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window
*parent)
[Libreoffice-commits] .: 2 commits - desktop/source
desktop/source/app/officeipcthread.cxx | 64 ++---
desktop/source/app/officeipcthread.hxx |2 -
2 files changed, 28 insertions(+), 38 deletions(-)
New commits:
commit 4ce2602befd59e69264d8e4ced8730b40c2b947c
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 13 15:41:10 2012 +0100
Related fdo#33484: Terminate OfficeIPCThread by closing the accepting pipe
... (and setting mbDowning to indicate an error returned from accept() is
due to
termination) instead of setting up an extra pipe connection to send an
InternalIPC::TerminateThread message (which allegedly caused deadlocks,
see
https://gerrit.libreoffice.org/#/c/1311/ Change Idf933915: office ipc:
use
timeout pipe feature when connecting to self).
Change-Id: Id302ca13112fc409685e7665b38f1030704a0ccf
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index e287d2b..8828311 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -51,8 +51,6 @@ using ::rtl::OString;
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
-const char *OfficeIPCThread::sc_aTerminationSequence =
InternalIPC::TerminateThread;
-const int OfficeIPCThread::sc_nTSeqLength = 28;
const char *OfficeIPCThread::sc_aShowSequence = -tofront;
const int OfficeIPCThread::sc_nShSeqLength = 5;
const char *OfficeIPCThread::sc_aConfirmationSequence =
InternalIPC::ProcessingDone;
@@ -427,8 +425,6 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread()
rtl::Reference OfficeIPCThread pThread(new OfficeIPCThread);
-pThread-maPipeIdent = OUString( SingleOfficeIPC_ );
-
// The name of the named pipe is created with the hashcode of the user
installation directory (without /user). We have to retrieve
// this information from a unotools implementation.
::utl::Bootstrap::PathStatus aLocateResult =
::utl::Bootstrap::locateUserInstallation( aUserInstallPath );
@@ -485,19 +481,19 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread()
if ( aUserInstallPathHashCode.isEmpty() )
return IPC_STATUS_BOOTSTRAP_ERROR; // Something completely broken, we
cannot create a valid hash code!
-pThread-maPipeIdent = pThread-maPipeIdent + aUserInstallPathHashCode;
+OUString aPipeIdent( SingleOfficeIPC_ + aUserInstallPathHashCode );
PipeMode nPipeMode = PIPEMODE_DONTKNOW;
do
{
osl::Security rSecurity = Security::get();
// Try to create pipe
-if ( pThread-maPipe.create( pThread-maPipeIdent.getStr(),
osl_Pipe_CREATE, rSecurity ))
+if ( pThread-maPipe.create( aPipeIdent.getStr(), osl_Pipe_CREATE,
rSecurity ))
{
// Pipe created
nPipeMode = PIPEMODE_CREATED;
}
-else if( pThread-maPipe.create( pThread-maPipeIdent.getStr(),
osl_Pipe_OPEN, rSecurity )) // Creation not successfull, now we try to connect
+else if( pThread-maPipe.create( aPipeIdent.getStr(), osl_Pipe_OPEN,
rSecurity )) // Creation not successfull, now we try to connect
{
osl::StreamPipe aStreamPipe(pThread-maPipe.getHandle());
char pReceiveBuffer[sc_nCSASeqLength + 1];
@@ -601,18 +597,8 @@ void OfficeIPCThread::DisableOfficeIPCThread(bool join)
pGlobalOfficeIPCThread);
pGlobalOfficeIPCThread.clear();
-// send thread a termination message
-// this is done so the subsequent join will not hang
-// because the thread hangs in accept of pipe
-osl::StreamPipe aPipe ( pOfficeIPCThread-maPipeIdent, osl_Pipe_OPEN,
Security::get() );
-if (aPipe.is())
-{
-aPipe.send( sc_aTerminationSequence, sc_nTSeqLength+1 ); // also
send 0-byte
-
-// close the pipe so that the streampipe on the other
-// side produces EOF
-aPipe.close();
-}
+pOfficeIPCThread-mbDowning = true;
+pOfficeIPCThread-maPipe.close();
// release mutex to avoid deadlocks
aMutex.clear();
@@ -680,22 +666,23 @@ void OfficeIPCThread::execute()
// down during wait
osl::ClearableMutexGuard aGuard( GetMutex() );
-if (!mbDowning)
+if ( mbDowning )
{
-// notify client we're ready to process its args
-int nBytes = 0;
-int nResult = 0;
-while (
-(nResult =
aStreamPipe.send(sc_aSendArgumentsSequence+nBytes, sc_nCSASeqLength-nBytes))0
-((nBytes += nResult) sc_nCSASeqLength) ) ;
+break;
}
+
+// notify client we're ready to process its args
+int nBytes = 0;
+int nResult;
+while (
+(nResult = aStreamPipe.send(sc_aSendArgumentsSequence+nBytes,
sc_nCSASeqLength-nBytes))0
+((nBytes +=
[Libreoffice-commits] .: 3 commits - sfx2/inc sfx2/source sw/inc sw/source sw/uiconfig vcl/inc vcl/source
sfx2/inc/sfx2/sfxdlg.hxx | 20 +--
sfx2/inc/sfx2/tabdlg.hxx | 12 +
sfx2/source/dialog/tabdlg.cxx| 20 +--
sfx2/source/view/printer.cxx |2
sw/inc/swabstdlg.hxx |2
sw/source/ui/app/docst.cxx | 202 ++-
sw/source/ui/dialog/swdlgfact.cxx| 30 ++--
sw/source/ui/dialog/swdlgfact.hxx| 19 ++
sw/source/ui/fmtui/tmpdlg.cxx| 12 -
sw/source/ui/inc/tmpdlg.hxx |1
sw/uiconfig/swriter/ui/captionoptions.ui | 14 +-
sw/uiconfig/swriter/ui/insertcaption.ui | 12 +
vcl/inc/vcl/dialog.hxx |4
vcl/source/window/dialog.cxx | 10 +
14 files changed, 226 insertions(+), 134 deletions(-)
New commits:
commit 0157f0b1ba364f7f9af2aacd1be9fbb5ddec2b4d
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 13 10:12:13 2012 +
Related: fdo#38606 keep style dialog open when apply is clicked
i.e. don't close and reopen, just stay open
Change-Id: I11cdc492e3c4adfb75c9a0dfa52e5ba351914858
diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx
index 3585645..0465dbb 100644
--- a/sfx2/inc/sfx2/sfxdlg.hxx
+++ b/sfx2/inc/sfx2/sfxdlg.hxx
@@ -55,7 +55,7 @@ namespace com { namespace sun { namespace star { namespace
frame {
class XModel;
} } } }
-class SfxAbstractDialog : public VclAbstractDialog
+class SfxAbstractDialog : virtual public VclAbstractDialog
{
public:
virtual const SfxItemSet* GetOutputItemSet() const = 0;
@@ -63,15 +63,21 @@ public:
virtual String GetText() const = 0;
};
-class SfxAbstractTabDialog : public SfxAbstractDialog
+class SfxAbstractTabDialog : virtual public SfxAbstractDialog
{
public:
virtual voidSetCurPageId( sal_uInt16 nId ) = 0;
-virtual const sal_uInt16* GetInputRanges( const SfxItemPool ) = 0;
+virtual const sal_uInt16* GetInputRanges( const SfxItemPool ) = 0;
virtual voidSetInputSet( const SfxItemSet* pInSet ) = 0;
};
-class SfxAbstractInsertObjectDialog : public VclAbstractDialog
+class SfxAbstractApplyTabDialog : virtual public SfxAbstractTabDialog
+{
+public:
+virtual voidSetApplyHdl( const Link rLink ) = 0;
+};
+
+class SfxAbstractInsertObjectDialog : virtual public VclAbstractDialog
{
public:
virtual com::sun::star::uno::Reference
com::sun::star::embed::XEmbeddedObject GetObject()=0;
@@ -79,7 +85,7 @@ public:
virtual sal_Bool IsCreateNew()=0;
};
-class SfxAbstractPasteDialog : public VclAbstractDialog
+class SfxAbstractPasteDialog : virtual public VclAbstractDialog
{
public:
virtual void Insert( SotFormatStringId nFormat, const String rFormatName
) = 0;
@@ -89,11 +95,11 @@ public:
const TransferableObjectDescriptor* pDesc=0 ) = 0;
};
-class SfxAbstractLinksDialog : public VclAbstractDialog
+class SfxAbstractLinksDialog : virtual public VclAbstractDialog
{
};
-class AbstractScriptSelectorDialog : public VclAbstractDialog
+class AbstractScriptSelectorDialog : virtual public VclAbstractDialog
{
public:
virtual String GetScriptURL() const = 0;
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index 6b1e985..c07c012 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -201,7 +201,13 @@ public:
voidSetApplyHandler(const Link _rHdl);
SAL_DLLPRIVATE void Start_Impl();
-SAL_DLLPRIVATE sal_Bool OK_Impl() { return PrepareLeaveCurrentPage(); }
+bool OK_Impl()
+{
+bool bRet = PrepareLeaveCurrentPage();
+if (bRet)
+Ok();
+return bRet;
+}
};
namespace sfx { class ItemConnectionBase; }
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 555680f..a6f8ab5 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -416,7 +416,7 @@ public:
sal_BoolbFmt =
sal_False,
sal_uInt16 nDefPage =
0,
const String* pFmtStr = 0)
= 0; //add for SwFrmDlg
-virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
+virtual SfxAbstractApplyTabDialog* CreateTemplateDialog(
Window* pParent,
SfxStyleSheetBase rBase,
sal_uInt16
nRegion,
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 3685eb1..ad8c702 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -497,6 +497,118 @@ void SwDocShell::ExecStyleSheet( SfxRequest rReq )
}
+class ApplyStyle
+{
+public:
+ApplyStyle(SwDocShell rDocSh, bool bNew, SfxStyleSheetBase* pStyle,
+
[PATCH] fix alphebetization
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1323 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/1323/1 fix alphebetization Change-Id: Iabf4d1e4d02c81cab580c07b65bb17da1877c6b1 --- M cui/UI_cui.mk 1 file changed, 2 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1323 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iabf4d1e4d02c81cab580c07b65bb17da1877c6b1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jack Leigh leigh...@gmx.se ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sfx2/source
sfx2/source/doc/templatedlg.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit af0a4a7a4efe19c88cf7cf567f49abe21a69df3d Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Thu Dec 13 16:07:29 2012 +0100 Template Manager: fixed typo in .src file Change-Id: I27195076b6a0a8f48c676d884d671fc9a746ce6b diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src index a9a844c..2480862 100644 --- a/sfx2/source/doc/templatedlg.src +++ b/sfx2/source/doc/templatedlg.src @@ -107,7 +107,7 @@ ModelessDialog DLG_TEMPLATE_MANAGER SVLook = TRUE; Moveable = TRUE; Closeable = TRUE; -Resizeable = TRUE; +Sizeable = TRUE; Hide = TRUE; Size = MAP_APPFONT ( 290 , 250 ); Text [en-US] = Template Manager; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/doc/templatedlg.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 83c36b07fc6d33577f2e624110e500b47842f910 Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Thu Dec 13 16:07:29 2012 +0100 Template Manager: fixed typo in .src file Change-Id: I27195076b6a0a8f48c676d884d671fc9a746ce6b diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src index a9a844c..2480862 100644 --- a/sfx2/source/doc/templatedlg.src +++ b/sfx2/source/doc/templatedlg.src @@ -107,7 +107,7 @@ ModelessDialog DLG_TEMPLATE_MANAGER SVLook = TRUE; Moveable = TRUE; Closeable = TRUE; -Resizeable = TRUE; +Sizeable = TRUE; Hide = TRUE; Size = MAP_APPFONT ( 290 , 250 ); Text [en-US] = Template Manager; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
git-new-workdir
On Wed, Dec 12, 2012 at 02:21:18PM -0500, Kohei Yoshida wrote: Not following the thread fully I'm not sure what this is about. I'm guessing this is about git-new-workdir vs submodules. To put it short, I got it to work, and so far I haven't seen any major issues but some occasional oddities which I just dismiss for now. What version of git do you use? I haven't gotten it to work on the submodules, actually. So I duplicate the submodules currently. I'd appreciate a description of how did it, actually. To me git-new-workdir is not about diskspace, but about avoiding the hassle of managing multiple local repos. Keeping it in one local repo make it easier to manage especially when I tend to cherry-pick between branches quite a lot. Exactly. In its absence, you have to constantly push/pull from one local repo to the other, and that's a hassle. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/po.cxx | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 3ddd4502c4d4e234017e01ead26813caf81593e8
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Thu Dec 13 15:32:02 2012 +0100
Fix adding keyid to po when read from file
Change-Id: I29fdd23da97f1102974a6b5821c224264a37efc3
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 8d51671..cdc2c98 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -793,14 +793,7 @@ void PoIfstream::readEntry( PoEntry rPoEntry )
(sType == text || sType == quickhelptext || sType == title)
!aGenPo.getMsgId().isEmpty() )
{
-if( rPoEntry.m_pGenPo )
-{
-*(rPoEntry.m_pGenPo) = aGenPo;
-}
-else
-{
-rPoEntry.m_pGenPo = new GenPoEntry( aGenPo );
-}
+//Generate keyid if po file not includes it
const OString sExtractCom = aGenPo.getExtractCom();
if( sExtractCom.isEmpty() ||
( sExtractCom.getLength() != 4
@@ -812,6 +805,14 @@ void PoIfstream::readEntry( PoEntry rPoEntry )
aGenPo.getReference() + sMsgCtxt +
aGenPo.getMsgId() ) );
}
+if( rPoEntry.m_pGenPo )
+{
+*(rPoEntry.m_pGenPo) = aGenPo;
+}
+else
+{
+rPoEntry.m_pGenPo = new GenPoEntry( aGenPo );
+}
rPoEntry.m_bIsInitialized = true;
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] Printer Properties widget and File-Properties widget
On Tue, 2012-12-11 at 18:52 +, Gokul Swaminathan wrote: Dear Mr. Caolan Manual conversion of Printer property dialog and file - Properties dialog. I have an doubt Regarding Custom Properties tab. we need to add 4 items on clicking the ADD button, how to handle it using Scroll bar. As of now i have added Scrolled window I've pushed these now to master, I haven't gotten around to adapting the code yet to use them. For the custom properties tab its probably a custom widget and we'll just have a placeholder in the .ui that get replaced by the custom widget, so a scrolled window (or a GtkDrawingArea) is fine as a placeholder for those cases. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH][PUSHED] Printer Properties widget and File-Properties widget
On Thu, 2012-12-13 at 15:32 +, Caolán McNamara wrote: I've pushed these now to master. grr, wanted to mark thread as pushed. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cui/UI_cui.mk
cui/UI_cui.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b040da8d0ea66a783635760ba6494a0f09cd2deb Author: Jack Leigh leigh...@gmx.se Date: Thu Dec 13 14:53:00 2012 + fix alphebetization Change-Id: Iabf4d1e4d02c81cab580c07b65bb17da1877c6b1 Reviewed-on: https://gerrit.libreoffice.org/1323 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk index a9ecc1e..32b64d4 100644 --- a/cui/UI_cui.mk +++ b/cui/UI_cui.mk @@ -17,11 +17,11 @@ $(eval $(call gb_UI_add_uifiles,cui,\ cui/uiconfig/ui/insertoleobject \ cui/uiconfig/ui/insertplugin \ cui/uiconfig/ui/insertrowcolumn \ - cui/uiconfig/ui/numberformatpage \ - cui/uiconfig/ui/scriptorganizer \ cui/uiconfig/ui/macroselectordialog \ + cui/uiconfig/ui/numberformatpage \ cui/uiconfig/ui/personalization_tab \ cui/uiconfig/ui/positionpage \ + cui/uiconfig/ui/scriptorganizer \ cui/uiconfig/ui/select_persona_dialog \ cui/uiconfig/ui/specialcharacters \ cui/uiconfig/ui/thesaurus \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fix alphebetization
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1323 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1323 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iabf4d1e4d02c81cab580c07b65bb17da1877c6b1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jack Leigh leigh...@gmx.se Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: filter/source
filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu | 2 +- filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu | 2 +- filter/source/config/fragments/filters/MS_Excel_95.xcu | 2 +- filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu | 2 +- filter/source/config/fragments/filters/MS_WinWord_6_0.xcu | 2 +- filter/source/config/fragments/filters/MS_Word_95.xcu | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 664d465a4b0f02200748067c0693eb95444174d4 Author: Bryan Quigley b...@bryanquigley.com Date: Wed Dec 12 15:34:12 2012 -0500 Removed save to Office 6.0/95 formats Change-Id: Ifeeb85afbd2531be772e27e10c6283158f0dac09 diff --git a/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu b/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu index d7fc944..bd8423b 100644 --- a/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- node oor:name=MS Excel 5.0/95 oor:op=replace -prop oor:name=FlagsvalueIMPORT EXPORT ALIEN PREFERRED/value/prop +prop oor:name=FlagsvalueIMPORT ALIEN PREFERRED/value/prop prop oor:name=UIComponent/ prop oor:name=FilterService/ prop oor:name=UserData/ diff --git a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu index edfb473..4542d27 100644 --- a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- node oor:name=MS Excel 5.0/95 Vorlage/Template oor:op=replace -prop oor:name=FlagsvalueIMPORT EXPORT ALIEN TEMPLATE TEMPLATEPATH/value/prop +prop oor:name=FlagsvalueIMPORT ALIEN TEMPLATE TEMPLATEPATH/value/prop prop oor:name=UIComponent/ prop oor:name=FilterService/ prop oor:name=UserData/ diff --git a/filter/source/config/fragments/filters/MS_Excel_95.xcu b/filter/source/config/fragments/filters/MS_Excel_95.xcu index 79d259d..4e227ca 100644 --- a/filter/source/config/fragments/filters/MS_Excel_95.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_95.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- node oor:name=MS Excel 95 oor:op=replace -prop oor:name=FlagsvalueIMPORT EXPORT ALIEN PREFERRED/value/prop +prop oor:name=FlagsvalueIMPORT ALIEN PREFERRED/value/prop prop oor:name=UIComponent/ prop oor:name=FilterService/ prop oor:name=UserData/ diff --git a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu index 1ef6756..a5eab88 100644 --- a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- node oor:name=MS Excel 95 Vorlage/Template oor:op=replace -prop oor:name=FlagsvalueIMPORT EXPORT ALIEN TEMPLATE TEMPLATEPATH/value/prop +prop oor:name=FlagsvalueIMPORT ALIEN TEMPLATE TEMPLATEPATH/value/prop prop oor:name=UIComponent/ prop oor:name=FilterService/ prop oor:name=UserData/ diff --git a/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu b/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu index 00a3aa4..e784b52 100644 --- a/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu +++ b/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- node oor:name=MS WinWord 6.0 oor:op=replace -prop oor:name=FlagsvalueIMPORT EXPORT ALIEN/value/prop +prop oor:name=FlagsvalueIMPORT ALIEN/value/prop prop oor:name=UIComponent/ prop oor:name=FilterService/ prop oor:name=UserDatavalueCWW6/value/prop diff --git a/filter/source/config/fragments/filters/MS_Word_95.xcu b/filter/source/config/fragments/filters/MS_Word_95.xcu index ffea860..356b8fa 100644 --- a/filter/source/config/fragments/filters/MS_Word_95.xcu +++ b/filter/source/config/fragments/filters/MS_Word_95.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- node oor:name=MS Word 95 oor:op=replace -prop oor:name=FlagsvalueIMPORT EXPORT ALIEN/value/prop +prop oor:name=FlagsvalueIMPORT ALIEN/value/prop prop oor:name=UIComponent/ prop oor:name=FilterService/ prop oor:name=UserDatavalueCWW6/value/prop
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - filter/source
filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu | 2 +- filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu | 2 +- filter/source/config/fragments/filters/MS_Excel_95.xcu | 2 +- filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu | 2 +- filter/source/config/fragments/filters/MS_WinWord_6_0.xcu | 2 +- filter/source/config/fragments/filters/MS_Word_95.xcu | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 279ed1d1ea3e692072b19a510f0cba3d892ca046 Author: Bryan Quigley b...@bryanquigley.com Date: Wed Dec 12 15:34:12 2012 -0500 Resolves: fdo#53471 Remove save to Office 6.0/95 formats (cherry picked from commit 664d465a4b0f02200748067c0693eb95444174d4) Change-Id: Ifeeb85afbd2531be772e27e10c6283158f0dac09 Signed-off-by: Caolán McNamara caol...@redhat.com diff --git a/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu b/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu index d7fc944..bd8423b 100644 --- a/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- node oor:name=MS Excel 5.0/95 oor:op=replace -prop oor:name=FlagsvalueIMPORT EXPORT ALIEN PREFERRED/value/prop +prop oor:name=FlagsvalueIMPORT ALIEN PREFERRED/value/prop prop oor:name=UIComponent/ prop oor:name=FilterService/ prop oor:name=UserData/ diff --git a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu index edfb473..4542d27 100644 --- a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- node oor:name=MS Excel 5.0/95 Vorlage/Template oor:op=replace -prop oor:name=FlagsvalueIMPORT EXPORT ALIEN TEMPLATE TEMPLATEPATH/value/prop +prop oor:name=FlagsvalueIMPORT ALIEN TEMPLATE TEMPLATEPATH/value/prop prop oor:name=UIComponent/ prop oor:name=FilterService/ prop oor:name=UserData/ diff --git a/filter/source/config/fragments/filters/MS_Excel_95.xcu b/filter/source/config/fragments/filters/MS_Excel_95.xcu index 79d259d..4e227ca 100644 --- a/filter/source/config/fragments/filters/MS_Excel_95.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_95.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- node oor:name=MS Excel 95 oor:op=replace -prop oor:name=FlagsvalueIMPORT EXPORT ALIEN PREFERRED/value/prop +prop oor:name=FlagsvalueIMPORT ALIEN PREFERRED/value/prop prop oor:name=UIComponent/ prop oor:name=FilterService/ prop oor:name=UserData/ diff --git a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu index 1ef6756..a5eab88 100644 --- a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- node oor:name=MS Excel 95 Vorlage/Template oor:op=replace -prop oor:name=FlagsvalueIMPORT EXPORT ALIEN TEMPLATE TEMPLATEPATH/value/prop +prop oor:name=FlagsvalueIMPORT ALIEN TEMPLATE TEMPLATEPATH/value/prop prop oor:name=UIComponent/ prop oor:name=FilterService/ prop oor:name=UserData/ diff --git a/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu b/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu index 00a3aa4..e784b52 100644 --- a/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu +++ b/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- node oor:name=MS WinWord 6.0 oor:op=replace -prop oor:name=FlagsvalueIMPORT EXPORT ALIEN/value/prop +prop oor:name=FlagsvalueIMPORT ALIEN/value/prop prop oor:name=UIComponent/ prop oor:name=FilterService/ prop oor:name=UserDatavalueCWW6/value/prop diff --git a/filter/source/config/fragments/filters/MS_Word_95.xcu b/filter/source/config/fragments/filters/MS_Word_95.xcu index ffea860..356b8fa 100644 --- a/filter/source/config/fragments/filters/MS_Word_95.xcu +++ b/filter/source/config/fragments/filters/MS_Word_95.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- node oor:name=MS Word 95 oor:op=replace -prop oor:name=FlagsvalueIMPORT EXPORT ALIEN/value/prop +prop oor:name=FlagsvalueIMPORT ALIEN/value/prop
[PUSHED] Re: Remove save to old Microsoft office formats
On Wed, 2012-12-12 at 18:05 -0500, Bryan Quigley wrote: Hi all, This patch removes the ability to save to old office 6/95 formats. I've also opened a bug on it here: https://bugs.freedesktop.org/show_bug.cgi?id=53471 It's a very trivial patch but: This contribution to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. This patch was also written before I joined Canonical. Was discussed in ESC call, so pushed to master and 4.0 now. Could you update the features page with this info, there should be some existing entry about the binfilter removal. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on|56068 | -- 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] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 20379fca091aa36bbd49a1ddc312c4210d383e78 Author: Caolán McNamara caol...@redhat.com Date: Thu Dec 13 16:05:59 2012 + Updated core Project: help ca261267f5f67d4932e0046e0358e8d0fb8b4d1b the .tree files are xml, so need xml comments not c++ ones diff --git a/helpcontent2 b/helpcontent2 index df4d4db..ca26126 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit df4d4db7408ed3fc135eded6787bad80853619fd +Subproject commit ca261267f5f67d4932e0046e0358e8d0fb8b4d1b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: source/auxiliary
source/auxiliary/sbasic.tree |7 +++ source/auxiliary/scalc.tree|7 +++ source/auxiliary/schart.tree |7 +++ source/auxiliary/shared.tree |7 +++ source/auxiliary/simpress.tree |7 +++ source/auxiliary/smath.tree|7 +++ source/auxiliary/swriter.tree |7 +++ 7 files changed, 21 insertions(+), 28 deletions(-) New commits: commit ca261267f5f67d4932e0046e0358e8d0fb8b4d1b Author: Caolán McNamara caol...@redhat.com Date: Thu Dec 13 16:05:59 2012 + the .tree files are xml, so need xml comments not c++ ones diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree index b228483..054daad 100644 --- a/source/auxiliary/sbasic.tree +++ b/source/auxiliary/sbasic.tree @@ -1,4 +1,5 @@ -/* +?xml version=1.0 encoding=UTF-8? +!-- * This file is part of the LibreOffice project. * * This Source Code Form is subject to the terms of the Mozilla Public @@ -14,9 +15,7 @@ * 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 . - */ - -?xml version=1.0 encoding=UTF-8? +-- tree_view version=24-Aug-2004 help_section application=sbasic id=07 title=Macros and Programming node id=0701 title=General Information and User Interface Usage diff --git a/source/auxiliary/scalc.tree b/source/auxiliary/scalc.tree index 0da6d2a..fbaf76d 100644 --- a/source/auxiliary/scalc.tree +++ b/source/auxiliary/scalc.tree @@ -1,4 +1,5 @@ -/* +?xml version=1.0 encoding=UTF-8? +!-- * This file is part of the LibreOffice project. * * This Source Code Form is subject to the terms of the Mozilla Public @@ -14,9 +15,7 @@ * 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 . - */ - -?xml version=1.0 encoding=UTF-8? +-- tree_view version=24-Aug-2004 help_section application=scalc id=08 title=Spreadsheets node id=0801 title=General Information and User Interface Usage diff --git a/source/auxiliary/schart.tree b/source/auxiliary/schart.tree index 4efafac..a470b99 100644 --- a/source/auxiliary/schart.tree +++ b/source/auxiliary/schart.tree @@ -1,4 +1,5 @@ -/* +?xml version=1.0 encoding=UTF-8? +!-- * This file is part of the LibreOffice project. * * This Source Code Form is subject to the terms of the Mozilla Public @@ -14,9 +15,7 @@ * 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 . - */ - -?xml version=1.0 encoding=UTF-8? +-- tree_view version=24-Aug-2004 help_section application=scalc id=05 title=Charts and Diagrams node id=0501 title=General Information diff --git a/source/auxiliary/shared.tree b/source/auxiliary/shared.tree index ba7c734..5fc0ca1 100644 --- a/source/auxiliary/shared.tree +++ b/source/auxiliary/shared.tree @@ -1,4 +1,5 @@ -/* +?xml version=1.0 encoding=UTF-8? +!-- * This file is part of the LibreOffice project. * * This Source Code Form is subject to the terms of the Mozilla Public @@ -14,9 +15,7 @@ * 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 . - */ - -?xml version=1.0 encoding=UTF-8? +-- tree_view version=24-Aug-2004 help_section application=swriter id=01 title=Installation topic id=shared/text/shared/guide/ms_doctypes.xhpChanging the Association of Microsoft Office Document Types/topic diff --git a/source/auxiliary/simpress.tree b/source/auxiliary/simpress.tree index 520639c..b27417c 100644 --- a/source/auxiliary/simpress.tree +++ b/source/auxiliary/simpress.tree @@ -1,4 +1,5 @@ -/* +?xml version=1.0 encoding=UTF-8? +!-- * This file is part of the LibreOffice project. * * This Source Code Form is subject to the terms of the Mozilla Public @@ -14,9 +15,7 @@ * 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 . - */ - -?xml version=1.0 encoding=UTF-8? +-- tree_view version=24-Aug-2004 help_section application=simpress id=04 title=Presentations and Drawings node id=0401 title=General Information and User Interface Usage diff --git a/source/auxiliary/smath.tree b/source/auxiliary/smath.tree index 6694bd8..07e61a0 100644 --- a/source/auxiliary/smath.tree +++ b/source/auxiliary/smath.tree @@ -1,4 +1,5 @@ -/* +?xml version=1.0 encoding=UTF-8? +!-- * This file is part of the LibreOffice project. * * This Source Code Form is subject to the terms of the Mozilla
[Libreoffice-commits] .: liborcus/ExternalProject_liborcus.mk liborcus/UnpackedTarball_orcus.mk liborcus/vsprojects
liborcus/ExternalProject_liborcus.mk|3
liborcus/UnpackedTarball_orcus.mk |4
liborcus/vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcxproj | 147
++
liborcus/vsprojects/liborcus/DefaultConfig.props| 14
liborcus/vsprojects/liborcus/zLib.props | 14
5 files changed, 180 insertions(+), 2 deletions(-)
New commits:
commit 355cbe5ca531abca784b9df7c002cf4b4feba74c
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Dec 13 18:10:35 2012 +0200
Add VS2010 project, avoids unreliable vcupgrade
diff --git a/liborcus/ExternalProject_liborcus.mk
b/liborcus/ExternalProject_liborcus.mk
index 0c64d86..9de89da 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -33,11 +33,10 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
export BOOST_LIB_DIR=$(OUTDIR)/lib \
-$(COMPATH)/../Common7/Tools/vcupgrade.exe
liborcus-static-nozip.vcproj \
MSBuild.exe liborcus-static-nozip.vcxproj /p:Configuration=Release
/p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \
touch $@
endif
-
+
else
# must be built with debug STL if --enable-dbgutil
diff --git a/liborcus/UnpackedTarball_orcus.mk
b/liborcus/UnpackedTarball_orcus.mk
index 3375c95..ca5232d 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_orcus.mk
@@ -27,4 +27,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,orcus,\
$(foreach patch,$(orcus_patches),liborcus/$(patch)) \
))
+$(eval $(call
gb_UnpackedTarball_add_file,orcus,vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcxproj,liborcus/vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcxproj))
+$(eval $(call
gb_UnpackedTarball_add_file,orcus,vsprojects/liborcus/DefaultConfig.props,liborcus/vsprojects/liborcus/DefaultConfig.props))
+$(eval $(call
gb_UnpackedTarball_add_file,orcus,vsprojects/liborcus/zLib.props,liborcus/vsprojects/liborcus/zLib.props))
+
# vim: set noet sw=4 ts=4:
diff --git
a/liborcus/vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcxproj
b/liborcus/vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcxproj
new file mode 100644
index 000..c63af42
--- /dev/null
+++ b/liborcus/vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcxproj
@@ -0,0 +1,147 @@
+?xml version=1.0 encoding=utf-8?
+Project DefaultTargets=Build ToolsVersion=4.0
xmlns=http://schemas.microsoft.com/developer/msbuild/2003;
+ ItemGroup Label=ProjectConfigurations
+ProjectConfiguration Include=Debug|Win32
+ ConfigurationDebug/Configuration
+ PlatformWin32/Platform
+/ProjectConfiguration
+ProjectConfiguration Include=Release|Win32
+ ConfigurationRelease/Configuration
+ PlatformWin32/Platform
+/ProjectConfiguration
+ /ItemGroup
+ PropertyGroup Label=Globals
+ProjectGuid{50DD1B15-9FEB-4037-9FBF-D52A711977E7}/ProjectGuid
+RootNamespaceliborcusnozip/RootNamespace
+ /PropertyGroup
+ Import Project=$(VCTargetsPath)\Microsoft.Cpp.Default.props /
+ PropertyGroup Condition='$(Configuration)|$(Platform)'=='Release|Win32'
Label=Configuration
+ConfigurationTypeStaticLibrary/ConfigurationType
+CharacterSetMultiByte/CharacterSet
+WholeProgramOptimizationtrue/WholeProgramOptimization
+ /PropertyGroup
+ PropertyGroup Condition='$(Configuration)|$(Platform)'=='Debug|Win32'
Label=Configuration
+ConfigurationTypeStaticLibrary/ConfigurationType
+CharacterSetMultiByte/CharacterSet
+ /PropertyGroup
+ Import Project=$(VCTargetsPath)\Microsoft.Cpp.props /
+ ImportGroup Label=ExtensionSettings
+ /ImportGroup
+ ImportGroup Condition='$(Configuration)|$(Platform)'=='Release|Win32'
Label=PropertySheets
+Import Project=$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props
Condition=exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')
Label=LocalAppDataPlatform /
+Import Project=..\liborcus\DefaultConfig.props /
+Import Project=..\liborcus\zLib.props /
+ /ImportGroup
+ ImportGroup Condition='$(Configuration)|$(Platform)'=='Debug|Win32'
Label=PropertySheets
+Import Project=$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props
Condition=exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')
Label=LocalAppDataPlatform /
+Import Project=..\liborcus\DefaultConfig.props /
+Import Project=..\liborcus\zLib.props /
+ /ImportGroup
+ PropertyGroup Label=UserMacros /
+ PropertyGroup
+_ProjectFileVersion10.0.40219.1/_ProjectFileVersion
+OutDir
Condition='$(Configuration)|$(Platform)'=='Debug|Win32'$(SolutionDir)$(Configuration)\/OutDir
+IntDir
Condition='$(Configuration)|$(Platform)'=='Debug|Win32'$(Configuration)\/IntDir
+OutDir
Regression Key word by BSA
Hi all, can you please leave some brief statements in Bug 58251 - BUGZILLAASSISTANT: Inappropriate regression keyword https://www.libreoffice.org/bugzilla/show_bug.cgi?id=58251 as base for a decision? Discussion if necessary please on libreoffice...@lists.freedesktop.org! Thank you and best regards Rainer Bielefeld (QA-Volunteer) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/text/portxt.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit d3a9e97164c0071d8b18f8dcf4197ec7c5c5c2f9
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 13 16:35:06 2012 +
Resolves: fdo#32181 #i68503# don't emit pesky space unless in tagged pdf
mode
which means that they are not there to be underlined
Change-Id: Ic02372c5284384e18198ebea44c36e83ccb6bf2a
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 617cf39..d2140b6 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -22,6 +22,7 @@
#include com/sun/star/i18n/ScriptType.hpp
#include i18npool/mslangid.hxx
#include hintids.hxx // CH_TXTATR
+#include EnhancedPDFExportHelper.hxx
#include SwPortionHandler.hxx
#include porlay.hxx
#include inftxt.hxx
@@ -717,7 +718,8 @@ SwLinePortion *SwHolePortion::Compress() { return this; }
void SwHolePortion::Paint( const SwTxtPaintInfo rInf ) const
{
// #i16816# tagged pdf support
-if( rInf.GetVsh() rInf.GetVsh()-GetViewOptions()-IsPDFExport() )
+if( rInf.GetVsh() rInf.GetVsh()-GetViewOptions()-IsPDFExport()
+SwTaggedPDFHelper::IsExportTaggedPDF( *rInf.GetOut()) )
{
const OUString aTxt( ' ' );
rInf.DrawText( aTxt, *this, 0, 1, false );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 32181, which changed state. Bug 32181 Summary: PRINTING: underlining in Justified aligned paragraph bleed over margin, also PDFEXPORT https://bugs.freedesktop.org/show_bug.cgi?id=32181 What|Removed |Added Status|ASSIGNED|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
[PATCH] Change in core[libreoffice-4-0]: Resolves: fdo#32181 #i68503# don't emit pesky space unless i...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1327 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/1327/1 Resolves: fdo#32181 #i68503# don't emit pesky space unless in tagged pdf mode which means that they are not there to be underlined Change-Id: Ic02372c5284384e18198ebea44c36e83ccb6bf2a (cherry picked from commit d3a9e97164c0071d8b18f8dcf4197ec7c5c5c2f9) --- M sw/source/core/text/portxt.cxx 1 file changed, 3 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1327 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic02372c5284384e18198ebea44c36e83ccb6bf2a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: Resolves: fdo#32181 #i68503# don't emit pesky space unless i...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1328 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/1328/1 Resolves: fdo#32181 #i68503# don't emit pesky space unless in tagged pdf mode which means that they are not there to be underlined Change-Id: Ic02372c5284384e18198ebea44c36e83ccb6bf2a (cherry picked from commit d3a9e97164c0071d8b18f8dcf4197ec7c5c5c2f9) --- M sw/source/core/text/portxt.cxx 1 file changed, 3 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1328 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic02372c5284384e18198ebea44c36e83ccb6bf2a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-5]: Resolves: fdo#32181 #i68503# don't emit pesky space unless i...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1329 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/1329/1 Resolves: fdo#32181 #i68503# don't emit pesky space unless in tagged pdf mode which means that they are not there to be underlined Change-Id: Ic02372c5284384e18198ebea44c36e83ccb6bf2a (cherry picked from commit d3a9e97164c0071d8b18f8dcf4197ec7c5c5c2f9) --- M sw/source/core/text/portxt.cxx 1 file changed, 3 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1329 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic02372c5284384e18198ebea44c36e83ccb6bf2a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Build Problem
Hi, I am a newbie in this LibreOffice Community and wanted to start contributing to it. However, when I am trying to build LibreOffice initially, I am facing one small error which is hindering my build. I know it might be too small for you experienced developers. Suggestions are welcome for this.. *On running ./autogen.sh on my ubuntu 11.10 oneiric terminal,following error is reported, . . . BEGIN failed--compilation aborted at -e line 1. configure: error: Failed to find some modules Error running configure at ./autogen.sh line 201. * Cheers, Akshay ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - oox/inc oox/source sc/source
oox/inc/oox/core/relations.hxx|2 ++
oox/source/core/relations.cxx |6 ++
oox/source/drawingml/hyperlinkcontext.cxx |4 +++-
sc/source/filter/inc/worksheetbuffer.hxx |4
sc/source/filter/oox/drawingfragment.cxx | 22 --
sc/source/filter/oox/workbookhelper.cxx |4 ++--
sc/source/filter/oox/worksheetbuffer.cxx | 19 +++
7 files changed, 56 insertions(+), 5 deletions(-)
New commits:
commit 70b960b966d36b1cb12bfb0c71d093fa0c5a3288
Author: Noel Power noel.po...@suse.com
Date: Thu Dec 13 16:52:50 2012 +
fix sometimes data corruption with xlsx import ( with scenario sheets )
formula import is buffered 'till the end of import. The processing of the
formula data need to happen before the scenario import happens. This is
necessary because sheet numbers stored in the formula addresses can become
invalid as scenario import insertes new hidden sheets upsetting the previous
table order
Change-Id: I9357f028f31bec1b1504ca991f5534f80d79c9bc
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index a9201ee..e5521e7 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -597,8 +597,6 @@ void WorkbookGlobals::finalize()
// #i79826# enable updating automatic row height after loading the
document
aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true );
-getFormulaBuffer().finalizeImport();
-
// Insert all pivot tables. Must be done after loading all sheets and
// formulas, because data pilots expect existing source data on
// creation.
@@ -674,6 +672,8 @@ void WorkbookHelper::finalizeWorkbookImport()
mrBookGlob.getWorkbookSettings().finalizeImport();
mrBookGlob.getViewSettings().finalizeImport();
+// need to import formulas before scenarios
+mrBookGlob.getFormulaBuffer().finalizeImport();
/* Insert scenarios after all sheet processing is done, because new hidden
sheets are created for scenarios which would confuse code that relies
on certain sheet indexes. Must be done after pivot tables too. */
commit 2551fec6d2a73d10cfa2aec85ae7d00e237e0294
Author: Noel Power noel.po...@suse.com
Date: Thu Dec 13 16:26:58 2012 +
fix fdo#58237 import hyperlinks for shapes in xlsx documents
Change-Id: Ib0c661dbb3ce9a2f8c8d29707a1cf0c65aadc81f
diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx
index f840448..94b9908 100644
--- a/oox/inc/oox/core/relations.hxx
+++ b/oox/inc/oox/core/relations.hxx
@@ -79,6 +79,8 @@ public:
/** Returns the external target of the relation with the passed relation
identifier. */
::rtl::OUString getExternalTargetFromRelId( const ::rtl::OUString
rRelId ) const;
+/** Returns the internal target of the relation with the passed relation
identifier. */
+::rtl::OUString getInternalTargetFromRelId( const ::rtl::OUString
rRelId ) const;
/** Returns the full fragment path for the target of the passed relation.
*/
::rtl::OUString getFragmentPathFromRelation( const Relation rRelation
) const;
diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx
index 501f515..c49fe63 100644
--- a/oox/source/core/relations.cxx
+++ b/oox/source/core/relations.cxx
@@ -83,6 +83,12 @@ OUString Relations::getExternalTargetFromRelId( const
OUString rRelId ) const
return (pRelation pRelation-mbExternal) ? pRelation-maTarget :
OUString();
}
+OUString Relations::getInternalTargetFromRelId( const OUString rRelId ) const
+{
+const Relation* pRelation = getRelationFromRelId( rRelId );
+return (pRelation !pRelation-mbExternal) ? pRelation-maTarget :
OUString();
+}
+
OUString Relations::getFragmentPathFromRelation( const Relation rRelation )
const
{
// no target, no fragment path
diff --git a/oox/source/drawingml/hyperlinkcontext.cxx
b/oox/source/drawingml/hyperlinkcontext.cxx
index f2d715c..231b7f9 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -44,10 +44,12 @@ HyperLinkContext::HyperLinkContext( ContextHandler rParent,
{
OSL_TRACE(OOX: URI rId %s, OUStringToOString (aRelId,
RTL_TEXTENCODING_UTF8).pData-buffer);
sHref = getRelations().getExternalTargetFromRelId( aRelId );
+OUString sExtHref = getRelations().getExternalTargetFromRelId( aRelId
);
+sURL = getRelations().getInternalTargetFromRelId( aRelId );
if( !sHref.isEmpty() )
{
OSL_TRACE(OOX: URI href %s, OUStringToOString (sHref,
RTL_TEXTENCODING_UTF8).pData-buffer);
-sURL = getFilter().getAbsoluteUrl( sHref );
+sURL = getFilter().getAbsoluteUrl( sExtHref );
}
}
OUString sTooltip = xAttributes-getOptionalValue( R_TOKEN( tooltip ) );
diff --git
Re: git-new-workdir
On 12/13/2012 10:21 AM, Lionel Elie Mamane wrote: On Wed, Dec 12, 2012 at 02:21:18PM -0500, Kohei Yoshida wrote: Not following the thread fully I'm not sure what this is about. I'm guessing this is about git-new-workdir vs submodules. To put it short, I got it to work, and so far I haven't seen any major issues but some occasional oddities which I just dismiss for now. What version of git do you use? I haven't gotten it to work on the submodules, actually. So I duplicate the submodules currently. I use git 1.8.0. I did upgrade my git specifically for submodules. I'd appreciate a description of how did it, actually. Well, there is not much to it, actually. Here is what I have/did. I have this primary master branch ~/libo/master and in it, submodules work more or less as expected. It automatically checks out required submodules which for me is just helpcontent2. Now, to create a new workdir for, say, libreoffice-4-0 branch, I run cd ~/libo git-new-workdir master libreoffice-4-0 libreoffice-4-0 I tend to name the directory the same name as the branch name. Then cd libreoffice-4-0 ln -s ../master/src git-new-workdir ../master/helpconent2 helpcontent2 libreoffice-4-0 to checkout helpcontent2. That's all. Now, I do the same with my own unpublished local branch, in which case I don't normally bother to create a branch for it in helpcontent2 (or any other submodules) due to laziness. I would think that you probably should create a branch for the submodules as well to get it to work, but I skip that step for now since not creating a branch in the submodules doesn't seem to create major pain for me. Plus I don't really push anything to any of the submodules. Now, I didn't really want to describe my settings because I don't really know if this is really not causing any issues. And unlike my previous settings, there is no automatic script to set up a new workdir. But it seems to just work fine for me. To me git-new-workdir is not about diskspace, but about avoiding the hassle of managing multiple local repos. Keeping it in one local repo make it easier to manage especially when I tend to cherry-pick between branches quite a lot. Exactly. In its absence, you have to constantly push/pull from one local repo to the other, and that's a hassle. Yup, and I prefer not having to do it. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: oox/inc oox/source sc/source
oox/inc/oox/core/relations.hxx|2 --
oox/source/core/relations.cxx |6 --
oox/source/drawingml/hyperlinkcontext.cxx |4 +---
sc/source/filter/inc/worksheetbuffer.hxx |4
sc/source/filter/oox/drawingfragment.cxx | 22 ++
sc/source/filter/oox/worksheetbuffer.cxx | 19 ---
6 files changed, 3 insertions(+), 54 deletions(-)
New commits:
commit 45b448b202b87ef66812d25c69e308f405ac221e
Author: Noel Power noel.po...@suse.com
Date: Thu Dec 13 17:04:58 2012 +
Revert fix fdo#58237 import hyperlinks for shapes in xlsx documents
This reverts commit 2551fec6d2a73d10cfa2aec85ae7d00e237e0294.
diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx
index 94b9908..f840448 100644
--- a/oox/inc/oox/core/relations.hxx
+++ b/oox/inc/oox/core/relations.hxx
@@ -79,8 +79,6 @@ public:
/** Returns the external target of the relation with the passed relation
identifier. */
::rtl::OUString getExternalTargetFromRelId( const ::rtl::OUString
rRelId ) const;
-/** Returns the internal target of the relation with the passed relation
identifier. */
-::rtl::OUString getInternalTargetFromRelId( const ::rtl::OUString
rRelId ) const;
/** Returns the full fragment path for the target of the passed relation.
*/
::rtl::OUString getFragmentPathFromRelation( const Relation rRelation
) const;
diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx
index c49fe63..501f515 100644
--- a/oox/source/core/relations.cxx
+++ b/oox/source/core/relations.cxx
@@ -83,12 +83,6 @@ OUString Relations::getExternalTargetFromRelId( const
OUString rRelId ) const
return (pRelation pRelation-mbExternal) ? pRelation-maTarget :
OUString();
}
-OUString Relations::getInternalTargetFromRelId( const OUString rRelId ) const
-{
-const Relation* pRelation = getRelationFromRelId( rRelId );
-return (pRelation !pRelation-mbExternal) ? pRelation-maTarget :
OUString();
-}
-
OUString Relations::getFragmentPathFromRelation( const Relation rRelation )
const
{
// no target, no fragment path
diff --git a/oox/source/drawingml/hyperlinkcontext.cxx
b/oox/source/drawingml/hyperlinkcontext.cxx
index 231b7f9..f2d715c 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -44,12 +44,10 @@ HyperLinkContext::HyperLinkContext( ContextHandler rParent,
{
OSL_TRACE(OOX: URI rId %s, OUStringToOString (aRelId,
RTL_TEXTENCODING_UTF8).pData-buffer);
sHref = getRelations().getExternalTargetFromRelId( aRelId );
-OUString sExtHref = getRelations().getExternalTargetFromRelId( aRelId
);
-sURL = getRelations().getInternalTargetFromRelId( aRelId );
if( !sHref.isEmpty() )
{
OSL_TRACE(OOX: URI href %s, OUStringToOString (sHref,
RTL_TEXTENCODING_UTF8).pData-buffer);
-sURL = getFilter().getAbsoluteUrl( sExtHref );
+sURL = getFilter().getAbsoluteUrl( sHref );
}
}
OUString sTooltip = xAttributes-getOptionalValue( R_TOKEN( tooltip ) );
diff --git a/sc/source/filter/inc/worksheetbuffer.hxx
b/sc/source/filter/inc/worksheetbuffer.hxx
index d58a490..bceca55 100644
--- a/sc/source/filter/inc/worksheetbuffer.hxx
+++ b/sc/source/filter/inc/worksheetbuffer.hxx
@@ -81,10 +81,6 @@ public:
sal_Int16 getCalcSheetIndex( const ::rtl::OUString
rWorksheetName ) const;
/** Returns the finalized name of the sheet with the passed worksheet
name. */
::rtl::OUString getCalcSheetName( const ::rtl::OUString
rWorksheetName ) const;
-/** Converts sSheetNameRef (e.g. '#SheetName!A1' to '#SheetName.A1' )
-if sSheetNameRef doesn't start with '#' it is ignored and not modified
-*/
-voidconvertSheetNameRef( ::rtl::OUString sSheetNameRef )
const;
private:
struct SheetInfo : public SheetInfoModel
diff --git a/sc/source/filter/oox/drawingfragment.cxx
b/sc/source/filter/oox/drawingfragment.cxx
index a301326..bb8fe08 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -26,9 +26,6 @@
#include com/sun/star/script/ScriptEventDescriptor.hpp
#include com/sun/star/script/XEventAttacherManager.hpp
#include rtl/strbuf.hxx
-#include svx/svdobj.hxx
-#include drwlayer.hxx
-#include userdat.hxx
#include oox/drawingml/connectorshapecontext.hxx
#include oox/drawingml/graphicshapecontext.hxx
#include oox/helper/attributelist.hxx
@@ -39,10 +36,11 @@
#include stylesbuffer.hxx
#include themebuffer.hxx
#include unitconverter.hxx
-#include worksheetbuffer.hxx
+
namespace oox {
namespace xls {
+using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::document;
@@ -55,10 +53,6 @@ using namespace ::oox::core;
using namespace
[Libreoffice-commits] .: libvisio/ExternalProject_libvisio.mk
libvisio/ExternalProject_libvisio.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 64f98aa1f492911c6ce1b76c394bd87abee330a2 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Dec 13 19:06:05 2012 +0200 /p:VisualStudioVersion=11.0 diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk index 191a712..3ad16c5 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/libvisio/ExternalProject_libvisio.mk @@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/external \ export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ -msbuild.exe libvisio.vcxproj /p:PlatformToolset=v110 /p:Configuration=Release \ +msbuild.exe libvisio.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \ touch $@ endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
* Present: + Stephan, Petr, Bjoern, Caolan, Kohei, Michael M, Eike, Joel, Lionel, Michael S, Thorsten * Completed Action Items + add completed technical 4.0 changes to features wiki page (Michael M) + grok the list of contributors for suitable certified hackers (Kendy) + have a list of people - bugs to process. + come up with a proposal for UNO breakage / ns timestamps (Stephan, Michael S, Lionel) + punt to next time + setup LibreOffice 4.1 schedule in the wiki (Petr) + check stlport situation with DudenCorrector (Thorsten) + thorough testing with Beta1 stlport removed planned + should get rid of stlport on all platforms in anticipation * Pending Action Items + create a new AmbitiousHacks wiki page, based on GSOC page (Michael M) + minimal triage for good mentors for proposed easy hacks (Bjoern) + work on mail to encourage them to get certified (Kendy/Stephan/Bjoern) + [ in progess ] + disable Rhino / Beanshell unless in experimental mode (Michael) + tweak the configure defaults (Kendy) + no submodules by default, no gnome-vfs + persuade Thorsten of final MSI / pkg naming / resting place (Kendy) + update the 4.0 release notes wiki page to explain DocumentInfo (Michael S) http://wiki.documentfoundation.org/ReleaseNotes/4.0#Extensions_.2F_API_changes + kill legacy stlport packaging (Stephan) * Release Engineering update (Petr) + 4.0 timeline: + Monday is the deadline for Beta2 + ideally the last deadline for delayed features + still no double etc. review needed until we get to RC1 + 3.6.4 retrospective + a good release, needed an rc3 only down to a minor slip + please don't forget to cherry-pick fixes from master - 4.0 - 3.6 + 3.6.5 - in January 14th + completing generic / Linux builds - RedHat (Caolan) AI: + mail details on signing etc. to Caolan (Fridrich) + fdo#58165 - drop stdlibs foo * UX input (Astron) + testing the Android remote + issues getting it connected, Android 2.3 + openSUSE AI: + interactive debugging on IRC (Thorsten) + question from Mirek - someone to look into + https://bugs.freedesktop.org/show_bug.cgi?id=46517 + full-word selection / editing ergonomics cf. UX-advise + template manager design concerns (Cedric) + ongoing discussion for 4.0 + old design file-templates-organise, new-templates documents + new template manager replaces the latter, needs work to replace the 'organise' function; seems similar but really isn't. + missing fn is importing styles into documents. + at least the common UI is much improved. * un-publishing DataPilot APIs (Kohei) + struggled to remove bits from types.rdb + done - thanks to Michael S. * gnome-vfs / dependencies issues (Bjoern) + if adding libbonobo is the solution then we have the wrong problem + causing crash-on-starts etc. - bin it for gio ... + we need to get rid of gnome-vfs in our downloadable build + no gio in RHEL5 base-line ... + punt till next time - Fridrich input required. + could potentially build with newer glib + new dbus menu bits conditional on gio (Bjoern) * bibisect build / brokenness (Bjoern) + 262 builds in a single bibisect repo 4GB small ... + poor download speed: 100k/sec (Joel) + bibisect could be improved to avoid compiling the center of back-to-back checkouts + some 1/4 of random checkouts don't build successfully * Disabling Office 95 export filters (Brian Q) + disable word 6 export ? (Caolan) + why are people even selecting that ? + decided: disable it for now, leave code in in case of screaming for a release or so (agreed) * Certification Committee update (Kendy/Stephan/Bjoern) + ongoing work as above. * Features - please update: + http://wiki.documentfoundation.org/ReleaseNotes/4.0 + with screenshots / feature details ... AI: + add impress remote shots (Thorsten) * 4.0 completed tasks: + un-publishing of data-pilot interfaces (Kohei) + liblangtag - fixed wrapper to not require loading until started (Eike) * 4.0 pending tasks + binfilter: + warn on legacy file-types with helpful dialog (needs owner) + drop Mozilla mess in the tree: + https://bugs.freedesktop.org/show_bug.cgi?id=56902 + lots of cleanup in configure + remove
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - offapi/com offapi/type_reference
offapi/com/sun/star/sheet/DataPilotSource.idl|2 +-
offapi/com/sun/star/sheet/DataPilotSourceDimension.idl |2 +-
offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl |2 +-
offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl |2 +-
offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl |2 +-
offapi/com/sun/star/sheet/DataPilotSourceLevel.idl |2 +-
offapi/com/sun/star/sheet/DataPilotSourceLevels.idl |2 +-
offapi/com/sun/star/sheet/DataPilotSourceMember.idl |2 +-
offapi/com/sun/star/sheet/DataPilotSourceMembers.idl |2 +-
offapi/com/sun/star/sheet/XDataPilotMemberResults.idl|2 +-
offapi/com/sun/star/sheet/XDataPilotResults.idl |2 +-
offapi/com/sun/star/sheet/XDimensionsSupplier.idl|2 +-
offapi/com/sun/star/sheet/XHierarchiesSupplier.idl |2 +-
offapi/com/sun/star/sheet/XLevelsSupplier.idl|2 +-
offapi/com/sun/star/sheet/XMembersSupplier.idl |2 +-
offapi/type_reference/types.rdb |binary
16 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit c517b205ea4a9d73be54ef1d3ccb1cbcd9c4c60b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Dec 12 20:27:34 2012 +0100
API CHANGE: unpublish Data Pilot interfaces
SERVICE: /UCR/com/sun/star/sheet/DataPilotSource
published in 1 but unpublished in 2
SERVICE: /UCR/com/sun/star/sheet/DataPilotSourceDimension
published in 1 but unpublished in 2
SERVICE: /UCR/com/sun/star/sheet/DataPilotSourceDimensions
published in 1 but unpublished in 2
SERVICE: /UCR/com/sun/star/sheet/DataPilotSourceHierarchies
published in 1 but unpublished in 2
SERVICE: /UCR/com/sun/star/sheet/DataPilotSourceHierarchy
published in 1 but unpublished in 2
SERVICE: /UCR/com/sun/star/sheet/DataPilotSourceLevel
published in 1 but unpublished in 2
SERVICE: /UCR/com/sun/star/sheet/DataPilotSourceLevels
published in 1 but unpublished in 2
SERVICE: /UCR/com/sun/star/sheet/DataPilotSourceMember
published in 1 but unpublished in 2
SERVICE: /UCR/com/sun/star/sheet/DataPilotSourceMembers
published in 1 but unpublished in 2
INTERFACE: /UCR/com/sun/star/sheet/XDataPilotMemberResults
published in 1 but unpublished in 2
INTERFACE: /UCR/com/sun/star/sheet/XDataPilotResults
published in 1 but unpublished in 2
INTERFACE: /UCR/com/sun/star/sheet/XDimensionsSupplier
published in 1 but unpublished in 2
INTERFACE: /UCR/com/sun/star/sheet/XHierarchiesSupplier
published in 1 but unpublished in 2
INTERFACE: /UCR/com/sun/star/sheet/XLevelsSupplier
published in 1 but unpublished in 2
INTERFACE: /UCR/com/sun/star/sheet/XMembersSupplier
published in 1 but unpublished in 2
(cherry picked from commit 0315ef5bbc168896b1d7d8ac5c1657f861fa6a93)
Conflicts:
offapi/type_reference/types.rdb
Change-Id: Ic7547e48f6b00409ed9fe5bf7c3e6921529c9598
diff --git a/offapi/com/sun/star/sheet/DataPilotSource.idl
b/offapi/com/sun/star/sheet/DataPilotSource.idl
index 0aabeff..920c17d 100644
--- a/offapi/com/sun/star/sheet/DataPilotSource.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSource.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module sheet {
pA component that implements this service can be used as data source
for a data pilot table in a spreadsheet document./p
*/
-published service DataPilotSource
+service DataPilotSource
{
/** provides access to the collection of the dimensions of the data
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
index e2c846b..f26c421 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
@@ -49,7 +49,7 @@
@see com::sun::star::sheet::DataPilotSource
@see com::sun::star::sheet::DataPilotTable
*/
-published service DataPilotSourceDimension
+service DataPilotSourceDimension
{
/** provides access to the name of the dimension, i.e. used in
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
b/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
index 3d634d3..f9fc475 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
@@ -30,7 +30,7 @@ module com { module sun { module star { module sheet {
@see com::sun::star::sheet::DataPilotSource
*/
-published service DataPilotSourceDimensions
+service DataPilotSourceDimensions
{
/** provides access by name to the dimensions in the collection.
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
b/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
index 1fbd6e6..9e2701a 100644
---
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - oox/source
oox/source/vml/vmlshape.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 04b32936c55c1fe543f86ac077d75dda7e2fb49b
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Fri Oct 5 15:30:11 2012 +0200
vml import: only apply width-percent attribute if it's != 0
This fixes an issue with a shape defined with these attributes:
mso-width-percent:0;mso-height-percent:0 and
mso-width-relative:page;mso-height-relative:page;
where all points were then located in (0,0)
Change-Id: I51070ad2b2e4e05ab64f16813472ca1d7099fb09
Reviewed-on: https://gerrit.libreoffice.org/775
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 1e9573e..fde972c 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -464,7 +464,9 @@ Reference XShape SimpleShape::implConvertAndInsert(
const Reference XShapes
if ( maTypeModel.maWidthRelative.isEmpty() ||
maTypeModel.maWidthRelative.equalsAscii( page ) )
{
sal_Int16 nWidth = maTypeModel.maWidthPercent.toInt32() / 10;
-PropertySet( xShape ).setAnyProperty(PROP_RelativeWidth,
makeAny( nWidth ) );
+// Only apply if nWidth != 0
+if ( nWidth )
+PropertySet( xShape ).setAnyProperty(PROP_RelativeWidth,
makeAny( nWidth ) );
}
}
if ( !maTypeModel.maHeightPercent.isEmpty( ) )
@@ -473,7 +475,9 @@ Reference XShape SimpleShape::implConvertAndInsert(
const Reference XShapes
if ( maTypeModel.maHeightRelative.isEmpty() ||
maTypeModel.maHeightRelative.equalsAscii( page ) )
{
sal_Int16 nHeight = maTypeModel.maHeightPercent.toInt32() / 10;
-PropertySet( xShape ).setAnyProperty(PROP_RelativeHeight,
makeAny( nHeight ) );
+// Only apply if nHeight != 0
+if ( nHeight )
+PropertySet( xShape ).setAnyProperty(PROP_RelativeHeight,
makeAny( nHeight ) );
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: is 'make check' supposed to work on ~master ?
Well, I re-tried 'make build ; make check' with './configure --disable-online-update'. But I run into the the following : (Maybe I should leave this alone for now ...) [build CUT] sw_subsequent_ooxmlimport ods Test xls Test xlsx Test csv Test ==5755== Conditional jump or move depends on uninitialised value(s) ==5755==at 0xE43D5E3: std::_Rb_treeunsigned long, std::pairunsigned long const, SvNumberformat*, std::_Select1ststd::pairunsigned long const, SvNumberformat* , std::lessunsigned long, std::allocatorstd::pairunsigned long const, SvNumberformat* ::_M_lower_bound(std::_Rb_tree_nodestd::pairunsigned long const, SvNumberformat* *, std::_Rb_tree_nodestd::pairunsigned long const, SvNumberformat* *, unsigned long const) (in /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/libsvllo.so) ==5755==by 0xE437F69: std::_Rb_treeunsigned long, std::pairunsigned long const, SvNumberformat*, std::_Select1ststd::pairunsigned long const, SvNumberformat* , std::lessunsigned long, std::allocatorstd::pairunsigned long const, SvNumberformat* ::find(unsigned long const) (in /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/libsvllo.so) ==5755==by 0xE432D2A: std::mapunsigned long, SvNumberformat*, std::lessunsigned long, std::allocatorstd::pairunsigned long const, SvNumberformat* ::find(unsigned long const) (in /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/libsvllo.so) ==5755==by 0xE4165E7: SvNumberFormatter::GetFormatEntry(unsigned long) (in /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/libsvllo.so) ==5755==by 0xE40BD31: SvNumberFormatter::IsNumberFormat(rtl::OUString const, unsigned long, double) (in /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/libsvllo.so) ==5755==by 0xA532CC0: ScColumn::SetString(long, short, String const, formula::FormulaGrammar::AddressConvention, ScSetStringParam*) (in /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/libsclo.so) ==5755==by 0xA967AD1: ScTable::SetString(short, long, short, String const, ScSetStringParam*) (in /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/libsclo.so) ==5755==by 0xA67C26C: ScDocument::SetString(short, long, short, rtl::OUString const, ScSetStringParam*) (in /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/libsclo.so) ==5755==by 0xB45C020: lcl_PutString(ScDocument*, short, long, short, String const, unsigned char, SvNumberFormatter*, bool, utl::TransliterationWrapper, CalendarWrapper, utl::TransliterationWrapper*, CalendarWrapper*) (in /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/libsclo.so) ==5755==by 0xB45EE90: ScImportExport::ExtText2Doc(SvStream) (in /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/libsclo.so) ==5755==by 0xB4544D3: ScImportExport::ImportStream(SvStream, String const, unsigned long) (in /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/libsclo.so) ==5755==by 0xB3415CB: ScDocShell::ConvertFrom(SfxMedium) (in /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/libsclo.so) ==5755==by 0xD8F5355: SfxObjectShell::DoLoad(SfxMedium*) (in /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/libsfxlo.so) ==5755==by 0x65EF318: ScFiltersTest::load(rtl::OUString const, rtl::OUString const, rtl::OUString const, rtl::OUString const, unsigned int, unsigned int, unsigned int) (in /usr/local/src/libreoffice/workdir/unxlngi6.pro/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so) ==5755==by 0x662804E: ScFiltersTest::testBrokenQuotesCSV() (in /usr/local/src/libreoffice/workdir/unxlngi6.pro/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so) ==5755==by 0x666F4D8: CppUnit::TestCallerScFiltersTest::runTest() (in /usr/local/src/libreoffice/workdir/unxlngi6.pro/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so) ==5755==by 0x4B895E10: CppUnit::TestCaseMethodFunctor::operator()() const (in /usr/lib/libcppunit-1.12.so.1.0.0) ==5755==by 0x4C337CD: (anonymous namespace)::Prot::protect(CppUnit::Functor const, CppUnit::ProtectorContext const) (in /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/unobootstrapprotector.so) ==5755==by 0x4B8930F1: CppUnit::ProtectorChain::ProtectFunctor::operator()() const (in /usr/lib/libcppunit-1.12.so.1.0.0) ==5755==by 0x4012ED5: (anonymous namespace)::Prot::protect(CppUnit::Functor const, CppUnit::ProtectorContext const) (in /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/unoexceptionprotector.so) ==5755==by 0x4B8930F1: CppUnit::ProtectorChain::ProtectFunctor::operator()() const (in /usr/lib/libcppunit-1.12.so.1.0.0) ==5755==by 0x4B88BDB9: CppUnit::DefaultProtector::protect(CppUnit::Functor const, CppUnit::ProtectorContext const) (in /usr/lib/libcppunit-1.12.so.1.0.0) ==5755==by 0x4B8930F1: CppUnit::ProtectorChain::ProtectFunctor::operator()() const (in /usr/lib/libcppunit-1.12.so.1.0.0) ==5755==by 0x4B892DC8: CppUnit::ProtectorChain::protect(CppUnit::Functor const, CppUnit::ProtectorContext const) (in /usr/lib/libcppunit-1.12.so.1.0.0) ==5755==by 0x4B89C5DD:
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c381a2f3063583d5e8750e3d13c46d02cd0cbb7c Author: Caolán McNamara caol...@redhat.com Date: Thu Dec 13 16:05:59 2012 + Updated core Project: help 84f109d2668f0bcbb11bbb5bff894466c538b052 the .tree files are xml, so need xml comments not c++ ones diff --git a/helpcontent2 b/helpcontent2 index 32c4964..84f109d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 32c4964e1415547af5dd956b590dc0edb3d10778 +Subproject commit 84f109d2668f0bcbb11bbb5bff894466c538b052 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - source/auxiliary
source/auxiliary/sbasic.tree |7 +++ source/auxiliary/scalc.tree|7 +++ source/auxiliary/schart.tree |7 +++ source/auxiliary/shared.tree |7 +++ source/auxiliary/simpress.tree |7 +++ source/auxiliary/smath.tree|7 +++ source/auxiliary/swriter.tree |7 +++ 7 files changed, 21 insertions(+), 28 deletions(-) New commits: commit 84f109d2668f0bcbb11bbb5bff894466c538b052 Author: Caolán McNamara caol...@redhat.com Date: Thu Dec 13 16:05:59 2012 + the .tree files are xml, so need xml comments not c++ ones diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree index b228483..054daad 100644 --- a/source/auxiliary/sbasic.tree +++ b/source/auxiliary/sbasic.tree @@ -1,4 +1,5 @@ -/* +?xml version=1.0 encoding=UTF-8? +!-- * This file is part of the LibreOffice project. * * This Source Code Form is subject to the terms of the Mozilla Public @@ -14,9 +15,7 @@ * 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 . - */ - -?xml version=1.0 encoding=UTF-8? +-- tree_view version=24-Aug-2004 help_section application=sbasic id=07 title=Macros and Programming node id=0701 title=General Information and User Interface Usage diff --git a/source/auxiliary/scalc.tree b/source/auxiliary/scalc.tree index 0da6d2a..fbaf76d 100644 --- a/source/auxiliary/scalc.tree +++ b/source/auxiliary/scalc.tree @@ -1,4 +1,5 @@ -/* +?xml version=1.0 encoding=UTF-8? +!-- * This file is part of the LibreOffice project. * * This Source Code Form is subject to the terms of the Mozilla Public @@ -14,9 +15,7 @@ * 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 . - */ - -?xml version=1.0 encoding=UTF-8? +-- tree_view version=24-Aug-2004 help_section application=scalc id=08 title=Spreadsheets node id=0801 title=General Information and User Interface Usage diff --git a/source/auxiliary/schart.tree b/source/auxiliary/schart.tree index 4efafac..a470b99 100644 --- a/source/auxiliary/schart.tree +++ b/source/auxiliary/schart.tree @@ -1,4 +1,5 @@ -/* +?xml version=1.0 encoding=UTF-8? +!-- * This file is part of the LibreOffice project. * * This Source Code Form is subject to the terms of the Mozilla Public @@ -14,9 +15,7 @@ * 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 . - */ - -?xml version=1.0 encoding=UTF-8? +-- tree_view version=24-Aug-2004 help_section application=scalc id=05 title=Charts and Diagrams node id=0501 title=General Information diff --git a/source/auxiliary/shared.tree b/source/auxiliary/shared.tree index ba7c734..5fc0ca1 100644 --- a/source/auxiliary/shared.tree +++ b/source/auxiliary/shared.tree @@ -1,4 +1,5 @@ -/* +?xml version=1.0 encoding=UTF-8? +!-- * This file is part of the LibreOffice project. * * This Source Code Form is subject to the terms of the Mozilla Public @@ -14,9 +15,7 @@ * 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 . - */ - -?xml version=1.0 encoding=UTF-8? +-- tree_view version=24-Aug-2004 help_section application=swriter id=01 title=Installation topic id=shared/text/shared/guide/ms_doctypes.xhpChanging the Association of Microsoft Office Document Types/topic diff --git a/source/auxiliary/simpress.tree b/source/auxiliary/simpress.tree index 520639c..b27417c 100644 --- a/source/auxiliary/simpress.tree +++ b/source/auxiliary/simpress.tree @@ -1,4 +1,5 @@ -/* +?xml version=1.0 encoding=UTF-8? +!-- * This file is part of the LibreOffice project. * * This Source Code Form is subject to the terms of the Mozilla Public @@ -14,9 +15,7 @@ * 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 . - */ - -?xml version=1.0 encoding=UTF-8? +-- tree_view version=24-Aug-2004 help_section application=simpress id=04 title=Presentations and Drawings node id=0401 title=General Information and User Interface Usage diff --git a/source/auxiliary/smath.tree b/source/auxiliary/smath.tree index 6694bd8..07e61a0 100644 --- a/source/auxiliary/smath.tree +++ b/source/auxiliary/smath.tree @@ -1,4 +1,5 @@ -/* +?xml version=1.0 encoding=UTF-8? +!-- * This file is part of the LibreOffice project. * * This Source Code Form is subject to the terms of the Mozilla
[Libreoffice-commits] .: helpcontent2 oox/inc oox/source sc/source
helpcontent2 |2 +-
oox/inc/oox/core/relations.hxx|2 ++
oox/source/core/relations.cxx |6 ++
oox/source/drawingml/hyperlinkcontext.cxx |5 +
sc/source/filter/inc/worksheetbuffer.hxx |4
sc/source/filter/oox/drawingfragment.cxx | 22 --
sc/source/filter/oox/worksheetbuffer.cxx | 19 +++
7 files changed, 57 insertions(+), 3 deletions(-)
New commits:
commit 5deba0e70c9287e6e933df458c21cc3e72f3aa70
Author: Noel Power noel.po...@suse.com
Date: Thu Dec 13 17:32:00 2012 +
fix fdo#58237 import hyperlinks for shapes in xlsx documents
Change-Id: I9c64c0f4d1eb8533b65f35d5e85e1ab4881a2b67
diff --git a/helpcontent2 b/helpcontent2
index ca26126..56562e9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ca261267f5f67d4932e0046e0358e8d0fb8b4d1b
+Subproject commit 56562e9b04dcbfd63012eecddb53b76dc4cee84b
diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx
index f840448..94b9908 100644
--- a/oox/inc/oox/core/relations.hxx
+++ b/oox/inc/oox/core/relations.hxx
@@ -79,6 +79,8 @@ public:
/** Returns the external target of the relation with the passed relation
identifier. */
::rtl::OUString getExternalTargetFromRelId( const ::rtl::OUString
rRelId ) const;
+/** Returns the internal target of the relation with the passed relation
identifier. */
+::rtl::OUString getInternalTargetFromRelId( const ::rtl::OUString
rRelId ) const;
/** Returns the full fragment path for the target of the passed relation.
*/
::rtl::OUString getFragmentPathFromRelation( const Relation rRelation
) const;
diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx
index 501f515..c49fe63 100644
--- a/oox/source/core/relations.cxx
+++ b/oox/source/core/relations.cxx
@@ -83,6 +83,12 @@ OUString Relations::getExternalTargetFromRelId( const
OUString rRelId ) const
return (pRelation pRelation-mbExternal) ? pRelation-maTarget :
OUString();
}
+OUString Relations::getInternalTargetFromRelId( const OUString rRelId ) const
+{
+const Relation* pRelation = getRelationFromRelId( rRelId );
+return (pRelation !pRelation-mbExternal) ? pRelation-maTarget :
OUString();
+}
+
OUString Relations::getFragmentPathFromRelation( const Relation rRelation )
const
{
// no target, no fragment path
diff --git a/oox/source/drawingml/hyperlinkcontext.cxx
b/oox/source/drawingml/hyperlinkcontext.cxx
index f2d715c..6da4db3 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -49,6 +49,11 @@ HyperLinkContext::HyperLinkContext( ContextHandler rParent,
OSL_TRACE(OOX: URI href %s, OUStringToOString (sHref,
RTL_TEXTENCODING_UTF8).pData-buffer);
sURL = getFilter().getAbsoluteUrl( sHref );
}
+else
+{
+// not sure if we also need to set sHref to the internal target
+sURL = getRelations().getInternalTargetFromRelId( aRelId );
+}
}
OUString sTooltip = xAttributes-getOptionalValue( R_TOKEN( tooltip ) );
if ( !sTooltip.isEmpty() )
diff --git a/sc/source/filter/inc/worksheetbuffer.hxx
b/sc/source/filter/inc/worksheetbuffer.hxx
index bceca55..d58a490 100644
--- a/sc/source/filter/inc/worksheetbuffer.hxx
+++ b/sc/source/filter/inc/worksheetbuffer.hxx
@@ -81,6 +81,10 @@ public:
sal_Int16 getCalcSheetIndex( const ::rtl::OUString
rWorksheetName ) const;
/** Returns the finalized name of the sheet with the passed worksheet
name. */
::rtl::OUString getCalcSheetName( const ::rtl::OUString
rWorksheetName ) const;
+/** Converts sSheetNameRef (e.g. '#SheetName!A1' to '#SheetName.A1' )
+if sSheetNameRef doesn't start with '#' it is ignored and not modified
+*/
+voidconvertSheetNameRef( ::rtl::OUString sSheetNameRef )
const;
private:
struct SheetInfo : public SheetInfoModel
diff --git a/sc/source/filter/oox/drawingfragment.cxx
b/sc/source/filter/oox/drawingfragment.cxx
index bb8fe08..a301326 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -26,6 +26,9 @@
#include com/sun/star/script/ScriptEventDescriptor.hpp
#include com/sun/star/script/XEventAttacherManager.hpp
#include rtl/strbuf.hxx
+#include svx/svdobj.hxx
+#include drwlayer.hxx
+#include userdat.hxx
#include oox/drawingml/connectorshapecontext.hxx
#include oox/drawingml/graphicshapecontext.hxx
#include oox/helper/attributelist.hxx
@@ -36,11 +39,10 @@
#include stylesbuffer.hxx
#include themebuffer.hxx
#include unitconverter.hxx
-
+#include worksheetbuffer.hxx
namespace oox {
namespace xls {
-using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::document;
@@ -53,6 +55,10
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - helpcontent2 oox/inc oox/source sc/source
helpcontent2 |2 +-
oox/inc/oox/core/relations.hxx|2 ++
oox/source/core/relations.cxx |6 ++
oox/source/drawingml/hyperlinkcontext.cxx |5 +
sc/source/filter/inc/worksheetbuffer.hxx |4
sc/source/filter/oox/drawingfragment.cxx | 22 --
sc/source/filter/oox/workbookhelper.cxx |4 ++--
sc/source/filter/oox/worksheetbuffer.cxx | 19 +++
8 files changed, 59 insertions(+), 5 deletions(-)
New commits:
commit 08a84bfc4043dbae9a52a4559a7e5a5337464e92
Author: Noel Power noel.po...@suse.com
Date: Thu Dec 13 18:15:45 2012 +
fix sometimes data corruption with xlsx import ( with scenario sheets )
formula import is buffered 'till the end of import. The processing of the
formula data need to happen before the scenario import happens. This is
necessary because sheet numbers stored in the formula addresses can become
invalid as scenario import insertes new hidden sheets upsetting the previous
table order
Change-Id: Id967a05ca06d1d918c959eaf1d1371ed2c6a4490
diff --git a/helpcontent2 b/helpcontent2
index 84f109d..d9d28eb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 84f109d2668f0bcbb11bbb5bff894466c538b052
+Subproject commit d9d28ebb575e96e742d6590a28dd59c62b89dc4e
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index a9201ee..e5521e7 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -597,8 +597,6 @@ void WorkbookGlobals::finalize()
// #i79826# enable updating automatic row height after loading the
document
aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true );
-getFormulaBuffer().finalizeImport();
-
// Insert all pivot tables. Must be done after loading all sheets and
// formulas, because data pilots expect existing source data on
// creation.
@@ -674,6 +672,8 @@ void WorkbookHelper::finalizeWorkbookImport()
mrBookGlob.getWorkbookSettings().finalizeImport();
mrBookGlob.getViewSettings().finalizeImport();
+// need to import formulas before scenarios
+mrBookGlob.getFormulaBuffer().finalizeImport();
/* Insert scenarios after all sheet processing is done, because new hidden
sheets are created for scenarios which would confuse code that relies
on certain sheet indexes. Must be done after pivot tables too. */
commit 691f7a1554cee0863258f2bfbfb3ab656ead57a1
Author: Noel Power noel.po...@suse.com
Date: Thu Dec 13 16:26:58 2012 +
fix fdo#58237 import hyperlinks for shapes in xlsx documents
Change-Id: Ib0c661dbb3ce9a2f8c8d29707a1cf0c65aadc81f
diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx
index f840448..94b9908 100644
--- a/oox/inc/oox/core/relations.hxx
+++ b/oox/inc/oox/core/relations.hxx
@@ -79,6 +79,8 @@ public:
/** Returns the external target of the relation with the passed relation
identifier. */
::rtl::OUString getExternalTargetFromRelId( const ::rtl::OUString
rRelId ) const;
+/** Returns the internal target of the relation with the passed relation
identifier. */
+::rtl::OUString getInternalTargetFromRelId( const ::rtl::OUString
rRelId ) const;
/** Returns the full fragment path for the target of the passed relation.
*/
::rtl::OUString getFragmentPathFromRelation( const Relation rRelation
) const;
diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx
index 501f515..c49fe63 100644
--- a/oox/source/core/relations.cxx
+++ b/oox/source/core/relations.cxx
@@ -83,6 +83,12 @@ OUString Relations::getExternalTargetFromRelId( const
OUString rRelId ) const
return (pRelation pRelation-mbExternal) ? pRelation-maTarget :
OUString();
}
+OUString Relations::getInternalTargetFromRelId( const OUString rRelId ) const
+{
+const Relation* pRelation = getRelationFromRelId( rRelId );
+return (pRelation !pRelation-mbExternal) ? pRelation-maTarget :
OUString();
+}
+
OUString Relations::getFragmentPathFromRelation( const Relation rRelation )
const
{
// no target, no fragment path
diff --git a/oox/source/drawingml/hyperlinkcontext.cxx
b/oox/source/drawingml/hyperlinkcontext.cxx
index 209e733..1329c30 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -50,6 +50,11 @@ HyperLinkContext::HyperLinkContext( ContextHandler rParent,
OSL_TRACE(OOX: URI href %s, ::rtl::OUStringToOString (sHref,
RTL_TEXTENCODING_UTF8).pData-buffer);
sURL = getFilter().getAbsoluteUrl( sHref );
}
+else
+{
+// not sure if we also need to set sHref to the internal target
+sURL = getRelations().getInternalTargetFromRelId( aRelId );
+}
}
OUString sTooltip =
[Libreoffice-commits] .: cui/source desktop/source editeng/source
cui/source/tabpages/autocdlg.cxx |6 ++---
desktop/source/migration/migration.cxx |8 +++
editeng/source/misc/svxacorr.cxx | 35 +++--
3 files changed, 27 insertions(+), 22 deletions(-)
New commits:
commit 623410669fa2d5da9a2ce4e3c4b81ce23605a6df
Author: Eike Rathke er...@redhat.com
Date: Thu Dec 13 19:51:52 2012 +0100
fdo#58060 use acor_und.dat and LANGUAGE_UNDETERMINED
Previous versions used an empty language tag for LANGUAGE_DONTKNOW with the
[All] autocorrection entry and read/wrote from/to arco_.dat file. An empty
language tag otherwise is used for system locale and doesn't convert
flawlessly
with the new LanguageTag system. Instead use LANGUAGE_UNDETERMINED with the
ISO
639 code 'und' so the file name is acor_und.dat.
During user profile migration an existing 3/user/autocorr/acor_.dat is
copied
to the new 4/user/autocorr/acor_und.dat
Change-Id: I593f24829c6efd58f36e93ebd3385a3c925f7217
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 66bf164..48bd0c7 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -111,7 +111,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const
SfxItemSet* _pSet ) :
// initialize languages
//! LANGUAGE_NONE is displayed as '[All]' and the LanguageType
-//! will be set to LANGUAGE_DONTKNOW
+//! will be set to LANGUAGE_UNDETERMINED
sal_Int16 nLangList = LANG_LIST_WESTERN;
if( SvtLanguageOptions().IsCTLFontEnabled() )
@@ -120,13 +120,13 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const
SfxItemSet* _pSet ) :
aLanguageLB.SelectLanguage( LANGUAGE_NONE );
sal_uInt16 nPos = aLanguageLB.GetSelectEntryPos();
DBG_ASSERT( LISTBOX_ENTRY_NOTFOUND != nPos, listbox entry missing );
-aLanguageLB.SetEntryData( nPos, (void*)(long) LANGUAGE_DONTKNOW );
+aLanguageLB.SetEntryData( nPos, (void*)(long) LANGUAGE_UNDETERMINED );
// Initializing doesn't work for static on linux - therefore here
if( LANGUAGE_SYSTEM == eLastDialogLanguage )
eLastDialogLanguage =
Application::GetSettings().GetLanguageTag().getLanguageType();
-LanguageType nSelectLang = LANGUAGE_DONTKNOW;
+LanguageType nSelectLang = LANGUAGE_UNDETERMINED;
nPos = aLanguageLB.GetEntryPos( (void*)(long) eLastDialogLanguage );
if (LISTBOX_ENTRY_NOTFOUND != nPos)
nSelectLang = eLastDialogLanguage;
diff --git a/desktop/source/migration/migration.cxx
b/desktop/source/migration/migration.cxx
index 6036ef5..1b4115a 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -922,6 +922,14 @@ void MigrationImpl::copyFiles()
{
// remove installation prefix from file
localName = i_file-copy(m_aInfo.userdata.getLength());
+if (localName.endsWith( /autocorr/acor_.dat))
+{
+// Previous versions used an empty language tag for
+// LANGUAGE_DONTKNOW with the [All] autocorrection entry.
+// As of LibreOffice 4.0 it is 'und' for LANGUAGE_UNDETERMINED
+// so the file name is acor_und.dat.
+localName = localName.copy( 0, localName.getLength() - 4) +
und.dat;
+}
destName = userInstall + localName;
INetURLObject aURL(destName);
// check whether destination directory exists
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index b4fa5d0..50c5b02 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1481,11 +1481,11 @@ sal_Bool SvxAutoCorrect::AddCplSttException( const
String rNew,
pLists = nTmpVal-second;
else
{
-nTmpVal = pLangTable-find(LANGUAGE_DONTKNOW);
+nTmpVal = pLangTable-find(LANGUAGE_UNDETERMINED);
if(nTmpVal != pLangTable-end())
pLists = nTmpVal-second;
-else if(CreateLanguageFile(LANGUAGE_DONTKNOW, sal_True))
-pLists = pLangTable-find(LANGUAGE_DONTKNOW)-second;
+else if(CreateLanguageFile(LANGUAGE_UNDETERMINED, sal_True))
+pLists = pLangTable-find(LANGUAGE_UNDETERMINED)-second;
}
OSL_ENSURE(pLists, No auto correction data);
return pLists-AddToCplSttExceptList(rNew);
@@ -1502,11 +1502,11 @@ sal_Bool SvxAutoCorrect::AddWrtSttException( const
String rNew,
pLists = nTmpVal-second;
else
{
-nTmpVal = pLangTable-find(LANGUAGE_DONTKNOW);
+nTmpVal = pLangTable-find(LANGUAGE_UNDETERMINED);
if(nTmpVal != pLangTable-end())
pLists = nTmpVal-second;
-else if(CreateLanguageFile(LANGUAGE_DONTKNOW, sal_True))
-pLists = pLangTable-find(LANGUAGE_DONTKNOW)-second;
+else if(CreateLanguageFile(LANGUAGE_UNDETERMINED, sal_True))
+pLists =
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - cui/source desktop/source editeng/source
cui/source/tabpages/autocdlg.cxx |6 ++---
desktop/source/migration/migration.cxx |8 +++
editeng/source/misc/svxacorr.cxx | 35 +++--
3 files changed, 27 insertions(+), 22 deletions(-)
New commits:
commit cbd9177a3985910312d4f6a4b7c2068bbab50619
Author: Eike Rathke er...@redhat.com
Date: Thu Dec 13 19:51:52 2012 +0100
fdo#58060 use acor_und.dat and LANGUAGE_UNDETERMINED
Previous versions used an empty language tag for LANGUAGE_DONTKNOW with the
[All] autocorrection entry and read/wrote from/to arco_.dat file. An empty
language tag otherwise is used for system locale and doesn't convert
flawlessly
with the new LanguageTag system. Instead use LANGUAGE_UNDETERMINED with the
ISO
639 code 'und' so the file name is acor_und.dat.
During user profile migration an existing 3/user/autocorr/acor_.dat is
copied
to the new 4/user/autocorr/acor_und.dat
Change-Id: I593f24829c6efd58f36e93ebd3385a3c925f7217
(cherry picked from commit 623410669fa2d5da9a2ce4e3c4b81ce23605a6df)
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 66bf164..48bd0c7 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -111,7 +111,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const
SfxItemSet* _pSet ) :
// initialize languages
//! LANGUAGE_NONE is displayed as '[All]' and the LanguageType
-//! will be set to LANGUAGE_DONTKNOW
+//! will be set to LANGUAGE_UNDETERMINED
sal_Int16 nLangList = LANG_LIST_WESTERN;
if( SvtLanguageOptions().IsCTLFontEnabled() )
@@ -120,13 +120,13 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const
SfxItemSet* _pSet ) :
aLanguageLB.SelectLanguage( LANGUAGE_NONE );
sal_uInt16 nPos = aLanguageLB.GetSelectEntryPos();
DBG_ASSERT( LISTBOX_ENTRY_NOTFOUND != nPos, listbox entry missing );
-aLanguageLB.SetEntryData( nPos, (void*)(long) LANGUAGE_DONTKNOW );
+aLanguageLB.SetEntryData( nPos, (void*)(long) LANGUAGE_UNDETERMINED );
// Initializing doesn't work for static on linux - therefore here
if( LANGUAGE_SYSTEM == eLastDialogLanguage )
eLastDialogLanguage =
Application::GetSettings().GetLanguageTag().getLanguageType();
-LanguageType nSelectLang = LANGUAGE_DONTKNOW;
+LanguageType nSelectLang = LANGUAGE_UNDETERMINED;
nPos = aLanguageLB.GetEntryPos( (void*)(long) eLastDialogLanguage );
if (LISTBOX_ENTRY_NOTFOUND != nPos)
nSelectLang = eLastDialogLanguage;
diff --git a/desktop/source/migration/migration.cxx
b/desktop/source/migration/migration.cxx
index 6036ef5..1b4115a 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -922,6 +922,14 @@ void MigrationImpl::copyFiles()
{
// remove installation prefix from file
localName = i_file-copy(m_aInfo.userdata.getLength());
+if (localName.endsWith( /autocorr/acor_.dat))
+{
+// Previous versions used an empty language tag for
+// LANGUAGE_DONTKNOW with the [All] autocorrection entry.
+// As of LibreOffice 4.0 it is 'und' for LANGUAGE_UNDETERMINED
+// so the file name is acor_und.dat.
+localName = localName.copy( 0, localName.getLength() - 4) +
und.dat;
+}
destName = userInstall + localName;
INetURLObject aURL(destName);
// check whether destination directory exists
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 4e59f09..cf486af 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1481,11 +1481,11 @@ sal_Bool SvxAutoCorrect::AddCplSttException( const
String rNew,
pLists = nTmpVal-second;
else
{
-nTmpVal = pLangTable-find(LANGUAGE_DONTKNOW);
+nTmpVal = pLangTable-find(LANGUAGE_UNDETERMINED);
if(nTmpVal != pLangTable-end())
pLists = nTmpVal-second;
-else if(CreateLanguageFile(LANGUAGE_DONTKNOW, sal_True))
-pLists = pLangTable-find(LANGUAGE_DONTKNOW)-second;
+else if(CreateLanguageFile(LANGUAGE_UNDETERMINED, sal_True))
+pLists = pLangTable-find(LANGUAGE_UNDETERMINED)-second;
}
OSL_ENSURE(pLists, No auto correction data);
return pLists-AddToCplSttExceptList(rNew);
@@ -1502,11 +1502,11 @@ sal_Bool SvxAutoCorrect::AddWrtSttException( const
String rNew,
pLists = nTmpVal-second;
else
{
-nTmpVal = pLangTable-find(LANGUAGE_DONTKNOW);
+nTmpVal = pLangTable-find(LANGUAGE_UNDETERMINED);
if(nTmpVal != pLangTable-end())
pLists = nTmpVal-second;
-else if(CreateLanguageFile(LANGUAGE_DONTKNOW, sal_True))
-pLists = pLangTable-find(LANGUAGE_DONTKNOW)-second;
+else
[Libreoffice-commits] Changes to 'suse-3.6.3'
New branch 'suse-3.6.3' available with the following commits: commit 7553ac8d6d214fa2cba0b9775d17a87ddb10208e Author: Petr Mladek pmla...@suse.cz Date: Thu Dec 13 20:40:58 2012 +0100 Branch suse-3.6.3 This is 'suse-3.6.3' - branch for the final stabilisation of the fist SUSE 3.6 release. Only very important and/or very safe changes are allowed. Please, keep pushing into suse-3.6 branch which will be used for the next potential bugfix releases. Change-Id: I1d12f03ace181059716a3ace194c8c382ac370e9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'suse-3.6.3'
New branch 'suse-3.6.3' available with the following commits: commit b44c28aa94749d9436f47603e7456abe5280018d Author: Petr Mladek pmla...@suse.cz Date: Thu Dec 13 20:40:59 2012 +0100 Branch suse-3.6.3 This is 'suse-3.6.3' - branch for the final stabilisation of the fist SUSE 3.6 release. Only very important and/or very safe changes are allowed. Please, keep pushing into suse-3.6 branch which will be used for the next potential bugfix releases. Change-Id: I5223a1411b005055b229dce20f6f6f91e2628d30 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'suse-3.6.3'
New branch 'suse-3.6.3' available with the following commits: commit 9d7f51cf1959793f6a0376e21af98b672b7f25fe Author: Petr Mladek pmla...@suse.cz Date: Thu Dec 13 20:40:59 2012 +0100 Branch suse-3.6.3 This is 'suse-3.6.3' - branch for the final stabilisation of the fist SUSE 3.6 release. Only very important and/or very safe changes are allowed. Please, keep pushing into suse-3.6 branch which will be used for the next potential bugfix releases. Change-Id: I83439660556b99fab3a46b00bc96399add1f6f88 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'suse-3.6.3'
New branch 'suse-3.6.3' available with the following commits: commit 45ed353464e662fb428873a7258cc3f334dfa95d Author: Petr Mladek pmla...@suse.cz Date: Thu Dec 13 20:40:59 2012 +0100 Branch suse-3.6.3 This is 'suse-3.6.3' - branch for the final stabilisation of the fist SUSE 3.6 release. Only very important and/or very safe changes are allowed. Please, keep pushing into suse-3.6 branch which will be used for the next potential bugfix releases. Change-Id: I7473206f8101bdfaaa3b4ccf74e7f146fca6f3a9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'suse-3.6.3'
New branch 'suse-3.6.3' available with the following commits: commit 8f52724d8a080fdc8fb55586515a8a5b6048112b Author: Petr Mladek pmla...@suse.cz Date: Thu Dec 13 20:41:00 2012 +0100 Branch suse-3.6.3 This is 'suse-3.6.3' - branch for the final stabilisation of the fist SUSE 3.6 release. Only very important and/or very safe changes are allowed. Please, keep pushing into suse-3.6 branch which will be used for the next potential bugfix releases. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
