[Libreoffice-commits] .: sw/source
sw/source/ui/uiview/viewmdi.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit d14f7e4ec48f9a9eee0585fb5ee72512e9f4bd19
Author: Winfried Donkers o...@dci-electronics.nl
Date: Sun Dec 9 12:34:45 2012 +0100
fdo#40465 fix to maintain correct focus whilst zooming
Change-Id: Ifed6e9a1fcb23e3565843842c3db695ab51b3d54
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index 286435e..17a1ac5 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -65,6 +65,9 @@ using namespace ::com::sun::star::frame;
void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, sal_Bool bViewOnly
)
{
_SetZoom( GetEditWin().GetOutputSizePixel(), eZoomType, nFactor, bViewOnly
);
+
+//fdo40465 force the cursor to stay in view whilst zooming
+pWrtShell-ShowCrsr();
}
void SwView::_SetZoom( const Size rEditSize, SvxZoomType eZoomType,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-4-0]: Make sure that *in this branch* we don't use too new tools
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1573
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/1573/1
Make sure that *in this branch* we don't use too new tools
This is the branch for 4.0.x and we want to use the VS 2010 compiler
here.
I think that we also don't want to use anyhing newer than Windows SDK
7.1, and .NET Framework 3.5, just to be sure.
Change-Id: I1b94af040829182c0f74edb94843b308251ad8a4
---
M oowintool
1 file changed, 21 insertions(+), 84 deletions(-)
diff --git a/oowintool b/oowintool
index 26221f0..6eed9cb 100755
--- a/oowintool
+++ b/oowintool
@@ -87,25 +87,11 @@
sub print_windows_sdk_home()
{
-my ($value, $key);
+my ($value);
-# This is for the Windows SDK 8 distributed with MSVS 2012
-$value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows
Kits/Installed Roots/KitsRoot');
-
- if (!defined $value) {
-$value = reg_get_value
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/CurrentInstallFolder');
-}
-if (!defined $value) {
-$value = reg_get_value
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
-}
-
-if (!defined $value) {
-# Unclear whether we ever get here, don't the above match any
-# recent Windows SDK?
-foreach $key
(File::Glob::bsd_glob('/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install
Dir')) {
-$value = reg_get_value ($key);
-last if defined $value;
-}
+foreach $ver (qw(7.1A 7.1 7.0A 7.0 6.0A)) {
+$value = reg_get_value
(HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v$ver/InstallationFolder);
+last if defined $value;
}
defined $value || die Windows SDK not found;
@@ -121,52 +107,19 @@
my ($value, $key);
-foreach $key
(File::Glob::bsd_glob('/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/*/WinSDK-NetFx40Tools/InstallationFolder')) {
-$key =~ s!^/proc/registry/!!;
-$value = reg_get_value ($key);
+$value = reg_get_value('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v7.0A/WinSDK-NetFx35Tools/InstallationFolder');
-# Sigh, the same test that configure does for al.exe
-# being either directly in it, or in a bin subdir... But on
-# the other hand we don't want to be mislead by a registry key
-# that matches the above but points to a directory that does
-# in fact not contain an al.exe. For me,
-# HKLM/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v7.0A/WinSDK-NetFx40Tools/InstallationFolder
-# contains
-# c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0
Tools\
-# but that then does not contain any al.exe.
+if (!defined $value) {
+$value =
reg_get_value('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v6.0A/WinSDKNetFxTools/InstallationFolder');
+}
-if (-f $value/bin/al.exe || -f $value/al.exe) {
-print cygpath ($value, 'w', $output_format);
-return;
-}
+if (-f $value/bin/al.exe || -f $value/al.exe) {
+print cygpath ($value, 'w', $output_format);
+return;
}
die Can't find al.exe;
}
-my %msvs_2008 = (
-'ver' = '9.0',
-'key' = 'Microsoft/VisualStudio/9.0/Setup/VS/ProductDir',
-'dll_path' = 'VC/redist/x86/Microsoft.VC90.CRT',
-'dll_suffix' = '90'
-);
-my %msvc_2008 = (
-'ver' = '9.0',
-'key' = 'Microsoft/VisualStudio/9.0/Setup/VC/ProductDir',
-'dll_path' = 'redist/x86/Microsoft.VC90.CRT',
-'dll_suffix' = '90'
-);
-my %msvs_express_2008 = (
-'ver' = '9.0',
-'key' = 'Microsoft/VCExpress/9.0/Setup/VS/ProductDir',
-'dll_path' = 'VC/redist/x86/Microsoft.VC90.CRT',
-'dll_suffix' = '90'
-);
-my %msvc_express_2008 = (
-'ver' = '9.0',
-'key' = 'Microsoft/VCExpress/9.0/Setup/VC/ProductDir',
-'dll_path' = 'redist/x86/Microsoft.VC90.CRT',
-'dll_suffix' = '90'
-);
my %msvs_2010 = (
'ver' = '10.0',
'key' = 'Microsoft/VisualStudio/10.0/Setup/VS/ProductDir',
@@ -179,22 +132,10 @@
'dll_path' = 'redist/x86/Microsoft.VC100.CRT',
'dll_suffix' = '100'
);
-my %msvs_2012 = (
-'ver' = '11.0',
-'key' = 'Microsoft/VisualStudio/11.0/Setup/VS/ProductDir',
-'dll_path' = 'VC/redist/x86/Microsoft.VC110.CRT',
-'dll_suffix' = '110'
-);
-my %msvc_2012 = (
-'ver' = '11.0',
-'key' = 'Microsoft/VisualStudio/11.0/Setup/VC/ProductDir',
-'dll_path' = 'redist/x86/Microsoft.VC110.CRT',
-'dll_suffix' = '110'
-);
sub find_msvs()
{
-my @ms_versions = ( \%msvs_2010, \%msvs_2012, \%msvs_2008,
\%msvs_express_2008 );
+my @ms_versions = ( \%msvs_2010 );
for $ver (@ms_versions) {
my $install = reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/ .
$ver-{'key'});
@@
[PUSHED] fdo#40465 fix to maintain correct focus whilst zooming
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1278 -- To view, visit https://gerrit.libreoffice.org/1278 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifed6e9a1fcb23e3565843842c3db695ab51b3d54 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Winfried Donkers o...@dci-electronics.nl Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Winfried Donkers o...@dci-electronics.nl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/source
sw/source/ui/uiview/viewmdi.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit aab8980a52eca1c0e5beefbfca6f24d125d6e097
Author: Winfried Donkers o...@dci-electronics.nl
Date: Sun Dec 9 12:34:45 2012 +0100
fdo#40465 fix to maintain correct focus whilst zooming
Change-Id: Ifed6e9a1fcb23e3565843842c3db695ab51b3d54
(cherry picked from commit d14f7e4ec48f9a9eee0585fb5ee72512e9f4bd19)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index 286435e..17a1ac5 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -65,6 +65,9 @@ using namespace ::com::sun::star::frame;
void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, sal_Bool bViewOnly
)
{
_SetZoom( GetEditWin().GetOutputSizePixel(), eZoomType, nFactor, bViewOnly
);
+
+//fdo40465 force the cursor to stay in view whilst zooming
+pWrtShell-ShowCrsr();
}
void SwView::_SetZoom( const Size rEditSize, SvxZoomType eZoomType,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/ui/uiview/viewmdi.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit e5dcec6e58b4bd8582380dd1f97957c369ba9182
Author: Winfried Donkers o...@dci-electronics.nl
Date: Sun Dec 9 12:34:45 2012 +0100
fdo#40465 fix to maintain correct focus whilst zooming
Change-Id: Ifed6e9a1fcb23e3565843842c3db695ab51b3d54
(cherry picked from commit d14f7e4ec48f9a9eee0585fb5ee72512e9f4bd19)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index 2a20f44..f600461 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -74,6 +74,9 @@ using namespace ::com::sun::star::frame;
void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, sal_Bool bViewOnly
)
{
_SetZoom( GetEditWin().GetOutputSizePixel(), eZoomType, nFactor, bViewOnly
);
+
+//fdo40465 force the cursor to stay in view whilst zooming
+pWrtShell-ShowCrsr();
}
void SwView::_SetZoom( const Size rEditSize, SvxZoomType eZoomType,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW]: fdo#40465 fix to maintain correct focus whilst zooming
https://gerrit.libreoffice.org/1278 Is it possible to have this patch pushed to version 3.6 as well? (At least our company would be very pleased with this :-) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/source
svx/source/table/tablemodel.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit f8552dca6b0142ce58bc2bdc25cfb170aa29506a
Author: K_Karthikeyan karthike...@kacst.edu.sa
Date: Mon Jan 7 13:50:23 2013 +0300
Optimization in for loop condition part
Change-Id: Ia9a52598e9c295fee8be040530ca232fddbd14c3
Reviewed-on: https://gerrit.libreoffice.org/1560
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 59358e3..65c8279 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -1028,10 +1028,11 @@ void TableModel::optimize()
if( !maRows.empty() !maColumns.empty() )
{
sal_Int32 nCol = getColumnCountImpl() - 1;
+sal_Int32 nRows = getRowCountImpl();
while( nCol 0 )
{
bool bEmpty = true;
-for( sal_Int32 nRow = 0; (nRow getRowCountImpl()) bEmpty;
nRow++ )
+for( sal_Int32 nRow = 0; (nRow nRows) bEmpty; nRow++ )
{
Reference XMergeableCell xCell( getCellByPosition( nCol,
nRow ), UNO_QUERY );
if( xCell.is() !xCell-isMerged() )
@@ -1065,10 +1066,11 @@ void TableModel::optimize()
}
sal_Int32 nRow = getRowCountImpl() - 1;
+sal_Int32 nCols = getColumnCountImpl();
while( nRow 0 )
{
bool bEmpty = true;
-for( nCol = 0; (nCol getColumnCountImpl()) bEmpty; nCol++ )
+for( nCol = 0; (nCol nCols) bEmpty; nCol++ )
{
Reference XMergeableCell xCell( getCellByPosition( nCol,
nRow ), UNO_QUERY );
if( xCell.is() !xCell-isMerged() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Optimization in for loop condition part
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1560 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1560 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia9a52598e9c295fee8be040530ca232fddbd14c3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Karthikeyan Krishnamurthi karthike...@kacst.edu.sa Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW]: fdo#40465 fix to maintain correct focus whilst zooming
On Tue, Jan 08, 2013 at 10:17:42AM +0100, Winfried Donkers w.donk...@dci-electronics.nl wrote: https://gerrit.libreoffice.org/1278 Is it possible to have this patch pushed to version 3.6 as well? Yes, I pushed it to -4-0 and -3-6 as well. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: embedserv/source
embedserv/source/inprocserv/inprocembobj.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 1f5ae5e8c18138d8537e5b080d87d0b61f451449
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 7 22:16:37 2013 +0100
test on the return of pOleObject-Close
Change-Id: Iee64f6f369e2312d479fa81e7a59fb962ed8d90e
Reviewed-on: https://gerrit.libreoffice.org/1567
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/embedserv/source/inprocserv/inprocembobj.cxx
b/embedserv/source/inprocserv/inprocembobj.cxx
index c6bad46..27c28ad 100644
--- a/embedserv/source/inprocserv/inprocembobj.cxx
+++ b/embedserv/source/inprocserv/inprocembobj.cxx
@@ -771,6 +771,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetHostNames(
LPCOLESTR szContainerApp, L
//---
STDMETHODIMP InprocEmbedDocument_Impl::Close( DWORD dwSaveOption )
{
+HRESULT ret = S_OK;
if ( m_pDefHandler CheckDefHandler() )
{
// no need to close if there is no default handler.
@@ -781,14 +782,18 @@ STDMETHODIMP InprocEmbedDocument_Impl::Close( DWORD
dwSaveOption )
if ( SUCCEEDED( hr ) pOleObject )
{
hr = pOleObject-Close( dwSaveOption );
+if (!SUCCEEDED(hr))
+ ret = hr;
hr = CoDisconnectObject( (IUnknown*)(IPersistStorage*)this, 0 );
+if (!(SUCCEEDED(hr) SUCCEEDED(ret)))
+ ret = hr;
}
}
// if the object is closed from outside that means that it should go to
uninitialized state
Clean();
-return S_OK;
+return ret;
}
//---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] test on the return of pOleObject-Close
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1567 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1567 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee64f6f369e2312d479fa81e7a59fb962ed8d90e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/aqua
vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx | 64 +-
1 file changed, 32 insertions(+), 32 deletions(-)
New commits:
commit 0b8352aaf9fc4704ac89def9993b0176c84e73db
Author: Tor Lillqvist t...@iki.fi
Date: Tue Jan 8 11:41:48 2013 +0200
More fallout from the ImplFontAttributes privatisation
Please, no more pointless changes like that. Or if you insist, please
do the required tedious changes in *all* affected source files (also
platforms/configurations that you don't build). They could in this
case, to a large exent, have been done blindly in a mechanical
fashion even without being able to build on all platforms.
diff --git a/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx
b/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx
index f29996f..4646e77 100644
--- a/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx
+++ b/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx
@@ -31,12 +31,12 @@ static bool GetDevFontAttributes( CTFontDescriptorRef
font_descriptor, ImplDevFo
int value = 0;
// reset the attributes
-rDFA.meFamily = FAMILY_DONTKNOW;
-rDFA.mePitch = PITCH_VARIABLE;
-rDFA.meWidthType = WIDTH_NORMAL;
-rDFA.meWeight = WEIGHT_NORMAL;
-rDFA.meItalic = ITALIC_NONE;
-rDFA.mbSymbolFlag = false;
+rDFA.SetFamilyType( FAMILY_DONTKNOW );
+rDFA.SetPitch( PITCH_VARIABLE );
+rDFA.SetWidthType( WIDTH_NORMAL );
+rDFA.SetWeight( WEIGHT_NORMAL );
+rDFA.SetItalic( ITALIC_NONE );
+rDFA.SetSymbolFlag( false );
rDFA.mbOrientation = true;
rDFA.mbDevice = true;
rDFA.mnQuality = 0;
@@ -66,7 +66,7 @@ static bool GetDevFontAttributes( CTFontDescriptorRef
font_descriptor, ImplDevFo
rDFA.mbEmbeddable = false;
CFStringRef family_name =
(CFStringRef)CTFontDescriptorCopyAttribute(font_descriptor,
kCTFontFamilyNameAttribute);
-rDFA.maName = GetOUString(family_name);
+rDFA.SetFamilyName( GetOUString(family_name) );
CFRelease(family_name);
CFDictionaryRef traits =
(CFDictionaryRef)CTFontDescriptorCopyAttribute(font_descriptor,
kCTFontTraitsAttribute);
@@ -76,31 +76,31 @@ static bool GetDevFontAttributes( CTFontDescriptorRef
font_descriptor, ImplDevFo
if(value kCTFontMonoSpaceTrait)
{
-rDFA.mePitch = PITCH_FIXED;
+rDFA.SetPitch( PITCH_FIXED );
}
if(value kCTFontItalicTrait)
{
-rDFA.meItalic = ITALIC_NORMAL;
+rDFA.SetItalic( ITALIC_NORMAL );
}
if(value kCTFontBoldTrait)
{
-rDFA.meWeight = WEIGHT_BOLD;
+rDFA.SetWeight( WEIGHT_BOLD );
}
if(value kCTFontCondensedTrait)
{
-rDFA.meWidthType = WIDTH_CONDENSED;
+rDFA.SetWidthType( WIDTH_CONDENSED );
}
else if(value kCTFontExpandedTrait)
{
-rDFA.meWidthType = WIDTH_EXPANDED;
+rDFA.SetWidthType( WIDTH_EXPANDED );
}
switch(value kCTFontClassMaskTrait)
{
case kCTFontOldStyleSerifsClass:
-rDFA.meFamily = FAMILY_ROMAN;
+rDFA.SetFamilyType( FAMILY_ROMAN );
break;
case kCTFontTransitionalSerifsClass:
case kCTFontModernSerifsClass:
@@ -109,15 +109,15 @@ static bool GetDevFontAttributes( CTFontDescriptorRef
font_descriptor, ImplDevFo
case kCTFontFreeformSerifsClass:
break;
case kCTFontSansSerifClass:
-rDFA.meFamily = FAMILY_SWISS;
+rDFA.SetFamilyType( FAMILY_SWISS );
case kCTFontOrnamentalsClass:
-rDFA.meFamily = FAMILY_DECORATIVE;
+rDFA.SetFamilyType( FAMILY_DECORATIVE );
break;
case kCTFontScriptsClass:
-rDFA.meFamily = FAMILY_SCRIPT;
+rDFA.SetFamilyType( FAMILY_SCRIPT );
break;
case kCTFontSymbolicClass:
-rDFA.mbSymbolFlag = true;
+rDFA.SetSymbolFlag( true );
break;
}
@@ -126,39 +126,39 @@ static bool GetDevFontAttributes( CTFontDescriptorRef
font_descriptor, ImplDevFo
CFNumberGetValue(weight, kCFNumberFloatType, fdval);
if(fdval 0.6)
{
-rDFA.meWeight = WEIGHT_BLACK;
+rDFA.SetWeight( WEIGHT_BLACK );
}
else if(fdval 0.4)
{
-rDFA.meWeight = WEIGHT_ULTRABOLD;
+rDFA.SetWeight( WEIGHT_ULTRABOLD );
}
else if (fdval 0.3)
{
-rDFA.meWeight = WEIGHT_BOLD;
+rDFA.SetWeight( WEIGHT_BOLD );
}
else if (fdval 0.0)
{
-rDFA.meWeight = WEIGHT_SEMIBOLD;
+rDFA.SetWeight( WEIGHT_SEMIBOLD );
}
else if (fdval = -0.8)
{
-rDFA.meWeight = WEIGHT_ULTRALIGHT;
+rDFA.SetWeight( WEIGHT_ULTRALIGHT );
}
else if (fdval = -0.4)
{
-rDFA.meWeight = WEIGHT_LIGHT;
+rDFA.SetWeight( WEIGHT_LIGHT );
}
else if (fdval = -0.3)
{
-rDFA.meWeight = WEIGHT_SEMILIGHT;
+rDFA.SetWeight( WEIGHT_SEMILIGHT );
}
else if (fdval = -0.2)
{
-rDFA.meWeight =
[Libreoffice-commits] .: sw/source
sw/source/ui/dochdl/swdtflvr.cxx | 12 +--
sw/source/ui/docvw/edtdd.cxx | 20 ++---
sw/source/ui/docvw/edtwin.cxx| 153 ++-
sw/source/ui/inc/pview.hxx | 60 ---
sw/source/ui/inc/uitool.hxx |2
sw/source/ui/ribbar/conform.cxx | 32 ++--
sw/source/ui/ribbar/conrect.cxx | 42 +++---
7 files changed, 129 insertions(+), 192 deletions(-)
New commits:
commit 639fe001aebef325d577c0e8e3283575563e6298
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Mon Jan 7 23:18:26 2013 +0100
Translate German comments, cleanup whitespace
Change-Id: I4cea9568c5f24340c6bdac387efe8e94f8edb95a
Reviewed-on: https://gerrit.libreoffice.org/1568
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 28bd60c..9dd3f36 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -583,7 +583,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef
xStream,
{
case SWTRANSFER_OBJECTTYPE_DRAWMODEL:
{
-// dont change the sequence of commands
+// don't change the sequence of commands
SdrModel *pModel = (SdrModel*)pObject;
xStream-SetBufferSize( 16348 );
@@ -822,7 +822,7 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut )
SwDoc *const pTmpDoc = lcl_GetDoc(*pClpDocFac);
-pTmpDoc-LockExpFlds(); // nie die Felder updaten - Text so
belassen
+pTmpDoc-LockExpFlds(); // Never update fields - leave text as is
lclOverWriteDoc(*pWrtShell, *pTmpDoc);
{
@@ -843,7 +843,7 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut )
pMarkAccess-deleteMark(*ppMark);
}
-// a new one was created in CORE (OLE-Objekte copied!)
+// a new one was created in CORE (OLE objects copied!)
aDocShellRef = pTmpDoc-GetTmpDocShell();
if( aDocShellRef.Is() )
SwTransferable::InitOle( aDocShellRef, *pTmpDoc );
@@ -2407,7 +2407,7 @@ int SwTransferable::_PasteFileName(
TransferableDataHelper rData,
sFileURL, aEmptyStr );
if( pFlt !rSh.GetView().GetDocShell()-ISA(SwWebDocShell) )
{
-// and then pull up the insert-region-dialog by PostUser event
+// and then pull up the insert-region-dialog by PostUser event
SwSectionData * pSect = new SwSectionData(
FILE_LINK_SECTION,
rSh.GetDoc()-GetUniqueSectionName() );
@@ -3053,7 +3053,7 @@ int SwTransferable::PrivatePaste( SwWrtShell rShell )
{
// first, ask for the SelectionType, then action-bracketing
// (otherwise it's not pasted into a TableSelection!!!)
-OSL_ENSURE( !rShell.ActionPend(), Paste darf nie eine Actionklammerung
haben );
+OSL_ENSURE( !rShell.ActionPend(), Paste must never have an ActionPend );
if ( !pClpDocFac )
return sal_False; // the return value of the SwFEShell::Paste also is
sal_Bool!
@@ -3092,7 +3092,7 @@ int SwTransferable::PrivatePaste( SwWrtShell rShell )
// in the buffer, word in this context means 'something with spaces at
beginning
// and end'. In this case we definitely want these spaces to be inserted here.
bInWrd = rShell.IsInWrd();
- bEndWrd = rShell.IsEndWrd();
+bEndWrd = rShell.IsEndWrd();
bSmart = bInWrd || bEndWrd;
if( bSmart )
{
diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx
index e607878..fab1fa8 100644
--- a/sw/source/ui/docvw/edtdd.cxx
+++ b/sw/source/ui/docvw/edtdd.cxx
@@ -77,7 +77,7 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point
rPosPixel )
if( rSh.GetDrawView()-Command( aDragEvent, this ) )
{
rView.GetViewFrame()-GetBindings().InvalidateAll(sal_False);
-return; // Event von der SdrView ausgewertet
+return; // Event evaluated by SdrView
}
}
@@ -218,13 +218,13 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent
rEvt )
}
-// There's a special treatment for file lists
with a single
-// element, that depends on the actual content of
the
-// Transferable to be accessible. Since the
transferable
-// may only be accessed after the drop has been
accepted
-// (according to KA due to Java DD), we'll have
to
-// reevaluate the drop action once more _with_ the
-// Transferable.
+// There's a special treatment for file lists with a single
+// element, that depends on the actual content of the
+//
[PUSHED] Translate German comments, cleanup whitespace
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1568 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1568 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4cea9568c5f24340c6bdac387efe8e94f8edb95a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Philipp Weissenbacher p.weissenbac...@gmail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Bug 38838 - Removal/Replacement of the String/UniString with OUString once and for all.
I forgot to mention that there are a few strange cases that are doign the same that the old code was doing: The following code converts a sal_uIntPtr to sal_Int32: +OUString info = OUString::valueOf( static_castsal_Int32( pProgrInfo-GetCurObj() ) ) ++ OUString::valueOf( static_castsal_Int32( pProgrInfo-GetObjCount() ) ); +info = OUString::valueOf( static_castsal_Int32( pProgrInfo-GetCurAction() ) ) ++ OUString::valueOf( static_castsal_Int32( pProgrInfo-GetActionCount() ) ); +info = OUString::valueOf( static_castsal_Int32( pProgrInfo-GetCurInsert() ) ) ++ OUString::valueOf( static_castsal_Int32( pProgrInfo-GetInsertCount() ) ); The following code converts a sal_uInt32 to sal_Int32: +rText.Append( OUString::valueOf( static_castsal_Int32( nCount ) ) ); +rText.Append( OUString::valueOf( static_castsal_Int32( GetValue( i ).nValue ) ) ); I just converted the code to do what the old code was doing, but I find these dodgy. Should OUString be enhanced to support these types? Thanks, Jean-Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LATE FEATURE: Personas in LibreOffice
Hi Cor, Cor Nouws píše v Po 07. 01. 2013 v 22:56 +0100: Idea looks great to me and is an invitement for futher enhancements in the future :-) I gues the code in a daily from 2012-12-28 (1) is not yet complet? I see the option page, but choosing an own background image does not work (file picker handling is broken) and a choosen persona is not shown... That's too old, you need a build post 2012-01-04. The 'own background' is not working even there, and will be removed from 4.0 if the Persona part is approved (otherwise both will go). Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Use MSBuild from .NET Framework 4.0
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1591 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/1591/1 Use MSBuild from .NET Framework 4.0 Otherwise building these external projects fails, at least for me. Change-Id: I20ea889537badf2713101b3296604a855451ae2f --- M lcms2/ExternalProject_lcms2.mk M libcdr/ExternalProject_libcdr.mk M liborcus/ExternalProject_liborcus.mk M libvisio/ExternalProject_libvisio.mk M libwpd/ExternalProject_libwpd.mk M python3/ExternalProject_python3.mk 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk index c8d93eb..80a98e1 100644 --- a/lcms2/ExternalProject_lcms2.mk +++ b/lcms2/ExternalProject_lcms2.mk @@ -20,7 +20,7 @@ ifeq ($(filter-out 14 13,$(COMEX)),) $(call gb_ExternalProject_get_state_target,lcms2,build): cd $(EXTERNAL_WORKDIR)/Projects/VC2010/lcms2_DLL \ -MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 \ +'/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe' lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 \ $(if $(filter 14,$(COMEX)),/p:PlatformToolset=v110) \ touch $@ else diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index f4dcab5..9d46d56 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -39,7 +39,7 @@ export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ -msbuild.exe libcdr.vcxproj /p:Configuration=Release \ +'/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe' libcdr.vcxproj /p:Configuration=Release \ touch $@ else $(call gb_ExternalProject_get_state_target,libcdr,build) : diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 0c64d86..ebdfd4d 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -34,7 +34,7 @@ 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 \ +'/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe' liborcus-static-nozip.vcxproj /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \ touch $@ endif diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk index 191a712..48aaf8a 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/libvisio/ExternalProject_libvisio.mk @@ -39,7 +39,7 @@ export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/extrenal \ export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ -msbuild.exe libvisio.vcxproj /p:Configuration=Release \ +'/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe' libvisio.vcxproj /p:Configuration=Release \ touch $@ else $(call gb_ExternalProject_get_state_target,libvisio,build) : diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk index 08d506c..4d11ff1 100644 --- a/libwpd/ExternalProject_libwpd.mk +++ b/libwpd/ExternalProject_libwpd.mk @@ -25,7 +25,7 @@ else ifeq ($(VCVER),100) $(call gb_ExternalProject_get_state_target,libwpd,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ -msbuild.exe libwpd.vcxproj /p:Configuration=Release \ +'/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe' libwpd.vcxproj /p:Configuration=Release \ touch $@ else $(call gb_ExternalProject_get_state_target,libwpd,build) : diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 2bde4cf..e4ba16d 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -32,7 +32,7 @@ touch $@ else ifeq ($(VCVER),100) cd $(EXTERNAL_WORKDIR)/PCbuild \ -MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /ToolsVersion:4.0 \ +MAKEFLAGS= '/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe' pcbuild.sln /t:Build /p:Configuration=Release /ToolsVersion:4.0 \ cd $(EXTERNAL_WORKDIR) \ ln -s PCbuild LO_lib \ touch $@ -- To view, visit https://gerrit.libreoffice.org/1591 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I20ea889537badf2713101b3296604a855451ae2f Gerrit-PatchSet: 1 Gerrit-Project: core
Re: LATE FEATURE: Personas in LibreOffice
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Kendy I got it working on master. Really nice work and some room or improvement as well:I wonder if the persona also has a footer to decorate the LO status bar. I got a crash on changing a persona to another, but I'll get a traceback as soon as I can. Some LibreOffice related personas http://www.getpersonas.com/en-US/gallery/All/search?p=libreofficesearch.x=0search.y=0 Regards Olivier Em 07-01-2013 08:32, Jan Holesovsky escreveu: Hi Astron, Caolán, Olivier, all, I'd like to ask you [or any additional reviewers :-)] for review of a late 4.0 feature - the Firefox Personas for LibreOffice. It is supposed to work like this: - the user chooses Tools - Options - Personalization - Select Persona - then navigates to http://www.getpersonas.com, and chooses Persona she likes - copies the URL of that Persona to clipboard, pastes that to the dialog, [OK] - closes the Options with [OK] And the the Persona is used in LibreOffice, like this: http://artax.karlin.mff.cuni.cz/~kendy/blog/pics/libreoffice-personas-1.png or http://artax.karlin.mff.cuni.cz/~kendy/blog/pics/libreoffice-personas-2.png Depends on the taste - there are 35k Personas to choose from :-) Of course, switching the Personas off again is trivial in Tools - Options - Personalization too. The patches that do that are quite small, in fact just this: http://cgit.freedesktop.org/libreoffice/core/commit/?id=a2500801cf2d337f176b074f9159df4925420af4 http://cgit.freedesktop.org/libreoffice/core/commit/?id=9ae27252a6a07f4b67a43be6c9289983f43b2e95 http://cgit.freedesktop.org/libreoffice/core/commit/?id=46505e82ad0f2bd9586e6c853e6e68635dc54007 http://cgit.freedesktop.org/libreoffice/core/commit/?id=3fc8c364cc58429bd840f47a80a9258de21ed131 But - there is one catch. There was no way to load .jpg directly in vcl (but logically, the functionality belongs there), so I moved GraphicFilter from svtools to vcl. The move will also allow simplification of some code in desktop/ I believe. Also there were some bugs in vcl that were triggered by the feature; and I fixed them. Consequently, the full list of patches to cherry-pick to libreoffice-4-0 is: git log 255c03d6ad4ed13c456ee621e0af765684a475d2~..4a4627eba410df933d004170d9f5638526acaed2 git log 540f090a68ae4375a36d0ee6dfbb4a82f28ac704~..540f090a68ae4375a36d0ee6dfbb4a82f28ac704 git log c223e5ff859171adab1597025b30ec2501fc5771~..3f3d0c52ae29b6ab6b2c10a5557714361aa76a26 Please let me know if this is acceptable, and if you need any help with the review. Thank you a lot, Kendy - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Fundação responsável civilmente, de acordo com o direito civil Detalhes Legais: http://www.documentfoundation.org/imprint LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQEcBAEBAgAGBQJQ6/DpAAoJEJp3R7nH3vLxUOIIAI3tzLd4Q8+eGtgJIyEzDg1g 3l8AN8oc7Bz28cqZYEODcPSzbYubAyjqXZPu1D3k65L6fyVNK9y+gFHnHyJgVSQr YzFtTXTjEHyNBy8OdVlPI6gbEnsNMQ1rkFT1/uJ1tGiKa9QPG/lyzcTP+2qnSdXp D/47RGkLXehuoBTuzqVSLlzEhECRXBI80VsLCmnfNJL+ypioJJhJdkL4QqgIn72+ WgxMkeNd44rD0Dm9XAkN+sXizj5+o796gXr+/cSK/uhZ3zp9xnhNd1w2QQgbofmK KPwROms02W7HnoCUwSn6EoOB7sAKsVq051ojTaOF072AfBXvJjEHeJt06ySt4GI= =HK7C -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/source
sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit eb54843c8556cd39efb4ade347652ad118c5de66
Author: Tor Lillqvist t...@iki.fi
Date: Tue Jan 8 12:17:10 2013 +0200
WaE: struct 'Size' was previously declared as a class
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
index 23d6187e..3043883 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
@@ -25,7 +25,7 @@
#include boost/scoped_ptr.hpp
#include vcl/bitmap.hxx
-struct Size;
+class Size;
namespace sd { namespace slidesorter { namespace cache {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Question about intended behaviour in UpdateTags (sd, annotationmanager.cxx)
On Thu, 2013-01-03 at 11:10 +0100, Matteo Casalin wrote:
827 if( bSynchron )
828 {
829 if( mnUpdateTagsEvent )
830 Application::RemoveUserEvent( mnUpdateTagsEvent );
831
832 UpdateTagsHdl(0);
I think that UpdateTagsHdl should be called unconditionally (and thus
back-indented), ... I already have a patch ready for this.
Yeah, I think that's the intent here, so sure, fix the indent and leave
it as unconditional.
C.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: UI issue
Hi Steve, On Mon, 2013-01-07 at 10:55 -0800, Steven Howe wrote: Two issue with respect to LibreOffice Writer and usability. So - first, thanks for your input - clearly we want to improve our UI and it's good to be aware of lots of these paper cuts / issues. Having said that this is clearly the wrong list for them - unless you're looking for code pointers to get hacking on them yourself ? Failing that, can you take these to the design or discuss lists and/or bugzilla ? Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-ux-advise] LATE FEATURE: Personas in LibreOffice
On Mon, Jan 7, 2013 at 4:32 AM, Jan Holesovsky ke...@suse.cz wrote: Please let me know if this is acceptable, and if you need any help with the review. It would be really nice to get this landed in 4.0. Many users ask for greater UI customization, and this is a great start. Putting technical issues aside, I don’t see UX problems in this. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Replace loop by memset in sal/typesconfig/typesconfig.c
On 12/24/2012 06:44 PM, Julien Nabet wrote:
On 24/12/2012 18:29, Norbert Thiebaud wrote:
On Mon, Dec 24, 2012 at 8:45 AM, julien2412serval2...@yahoo.fr wrote:
By taking a look at the file sal/typesconfig/typesconfig.c,
GetAlignment
function, I wonder if we could replace the for loop by a memset to
optimize
a bit.
So here's a straightforward patch:
diff --git a/sal/typesconfig/typesconfig.c
b/sal/typesconfig/typesconfig.c
index 473f07a..ef52c5f 100644
--- a/sal/typesconfig/typesconfig.c
+++ b/sal/typesconfig/typesconfig.c
@@ -262,11 +262,9 @@ int GetAlignment( Type eT )
{
char a[ 16*8 ];
long p = (long)(void*)a;
- int i;
/* clear a[...] to set legal value for double access */
- for ( i = 0; i 16*8; i++ )
-a[i] = 0;
+ memset(a, 0, sizeof(a));
p = ( p + 0xF ) ~0xF;
for ( i = 1; i 16; i++ )
Would it be ok?
well you can't remove
int i;
since it is still used in the second for loop.
and I doubt that that code is run very often... namely 4 times per
execution of the typesconfig executable... which in turn run dozens of
fprintf...
I'd say that this micro-optimization would be completely
un-measurable, and may or may not be an optimization at all depending
on how the memset is treated.
but sure, it is 'ok', as in it won't hurt anything.
The benefit of memset over an explicit loop here would be shorter, more
obvious (IMO) code, so I'd suggest you do the change after all.
Stephan
ok let's forget it, I suppose that the one who made this loop has
certainly good reasons for this + you must be right, micro-optimization
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/cell.hxx |4 +
sc/inc/docpool.hxx |1
sc/inc/scitems.hxx | 91 +++
sc/source/core/data/cell.cxx | 17 +++--
sc/source/core/data/docpool.cxx | 23 +++
sc/source/filter/excel/xicontent.cxx | 16 +
sc/source/filter/oox/worksheethelper.cxx | 29 +
sc/source/ui/view/gridwin.cxx| 40 +
8 files changed, 140 insertions(+), 81 deletions(-)
New commits:
commit 92afb61d8bb1b264a945371065115981ecaed0f1
Author: Noel Power noel.po...@suse.com
Date: Tue Jan 8 10:56:44 2013 +
support new hyperlink cell attribute
Allows a hyperlink attribute to be set for a cell, allows for import of say
a
hyperlink associated with a formula cell. Since this patch does not add
any file format support it is not possible to save such an imported
hyperlink
to ods. Note: such a hyperlink would not have been imported in the past so
this
should not be an issue
Change-Id: Ieb234bb6e98e4a2630b596a90972a75be12a92d4
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 521a28f..30ee12b 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -136,6 +136,8 @@ public:
boolHasValueData() const;
boolHasStringData() const;
rtl::OUString GetStringData() const; // only real strings
+// default implementation, creates url object from passed url
+static EditTextObject* CreateURLObjectFromURL( ScDocument rDoc, const
OUString rURL, const OUString rText );
static bool CellEqual( const ScBaseCell* pCell1, const ScBaseCell*
pCell2 );
@@ -501,7 +503,7 @@ public:
voidSetErrCode( sal_uInt16 n );
inline bool IsHyperLinkCell() const { return pCode
pCode-IsHyperLink(); }
-EditTextObject* CreateURLObject() ;
+EditTextObject* CreateURLObject();
voidGetURLResult( rtl::OUString rURL, rtl::OUString
rCellText );
/** Determines whether or not the result string contains more than one
paragraph */
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx
index 6fc0335..f187a48 100644
--- a/sc/inc/docpool.hxx
+++ b/sc/inc/docpool.hxx
@@ -40,6 +40,7 @@ class SC_DLLPUBLIC ScDocumentPool: public SfxItemPool
static sal_uInt16* pVersionMap9;
static sal_uInt16* pVersionMap10;
static sal_uInt16* pVersionMap11;
+static sal_uInt16* pVersionMap12;
public:
ScDocumentPool( SfxItemPool* pSecPool = NULL, sal_Bool
bLoadRefCounts = false );
diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx
index 41181d1..e4e5238 100644
--- a/sc/inc/scitems.hxx
+++ b/sc/inc/scitems.hxx
@@ -108,54 +108,55 @@
#define ATTR_SHADOW 152
#define ATTR_VALIDDATA 153
#define ATTR_CONDITIONAL154
+#define ATTR_HYPERLINK 155
-#define ATTR_PATTERN_END154 // end cell-attribute-pattern
+#define ATTR_PATTERN_END155 // end cell-attribute-pattern
-#define ATTR_PATTERN155
+#define ATTR_PATTERN156
// page attributes
-#define ATTR_LRSPACE156 // editor: PageDesc-TabPage
-#define ATTR_ULSPACE157
-#define ATTR_PAGE 158
-#define ATTR_PAGE_PAPERTRAY 159
-#define ATTR_PAGE_PAPERBIN 160
-#define ATTR_PAGE_SIZE 161
-#define ATTR_PAGE_MAXSIZE 162
-#define ATTR_PAGE_HORCENTER 163
-#define ATTR_PAGE_VERCENTER 164
-
-#define ATTR_PAGE_ON165 // editor: header/footer-page
-#define ATTR_PAGE_DYNAMIC 166
-#define ATTR_PAGE_SHARED167
-
-#define ATTR_PAGE_NOTES 168 // editor: table
-#define ATTR_PAGE_GRID 169
-#define ATTR_PAGE_HEADERS 170
-#define ATTR_PAGE_CHARTS171
-#define ATTR_PAGE_OBJECTS 172
-#define ATTR_PAGE_DRAWINGS 173
-#define ATTR_PAGE_TOPDOWN 174
-#define ATTR_PAGE_SCALE 175
-#define ATTR_PAGE_SCALETOPAGES 176
-#define ATTR_PAGE_FIRSTPAGENO 177
-
-#define ATTR_PAGE_PRINTAREA 178 // editor: print areas
-#define ATTR_PAGE_REPEATROW 179
-#define ATTR_PAGE_REPEATCOL 180
-#define ATTR_PAGE_PRINTTABLES 181
-
-#define ATTR_PAGE_HEADERLEFT182 // contents of header/
-#define ATTR_PAGE_FOOTERLEFT183 // footer (left)
-#define ATTR_PAGE_HEADERRIGHT 184 // contents of header/
-#define ATTR_PAGE_FOOTERRIGHT 185 // footer (right)
-#define ATTR_PAGE_HEADERSET 186 // the corresponding sets
-#define ATTR_PAGE_FOOTERSET 187
-
-#define ATTR_PAGE_FORMULAS 188
-#define ATTR_PAGE_NULLVALS 189
-
-#define ATTR_PAGE_SCALETO 190 // #i8868# scale printout to
width/height
-
-#define ATTR_HIDDEN 191
+#define ATTR_LRSPACE157 // editor: PageDesc-TabPage
+#define ATTR_ULSPACE158
+#define ATTR_PAGE 159
+#define ATTR_PAGE_PAPERTRAY 160
RE: [REVIEW]: fdo#40465 fix to maintain correct focus whilst zooming
Hi Miklos, Is it possible to have this patch pushed to version 3.6 as well? Yes, I pushed it to -4-0 and -3-6 as well. Thank you! Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Converted Exchange Databases widgets .ui
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1595 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/1595/1 Converted Exchange Databases widgets .ui Change-Id: I67301dbd5b77cc5439f80b6bf4c241ca953216fd --- A sw/uiconfig/swriter/ui/exchangedatabases.ui 1 file changed, 286 insertions(+), 0 deletions(-) diff --git a/sw/uiconfig/swriter/ui/exchangedatabases.ui b/sw/uiconfig/swriter/ui/exchangedatabases.ui new file mode 100644 index 000..0337480 --- /dev/null +++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui @@ -0,0 +1,286 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkAction id=action1/ + object class=GtkDialog id=Exchange Databases +property name=can_focusFalse/property +property name=border_width5/property +property name=title translatable=yesExchange Databases/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=button1 +property name=label translatable=yesDefine/property +property name=use_action_appearanceFalse/property +property name=related_actionaction1/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=close +property name=labelgtk-close/property +property name=use_action_appearanceFalse/property +property name=related_actionaction1/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=use_action_appearanceFalse/property +property name=related_actionaction1/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing6/property +child + object class=GtkFrame id=frame1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=left_padding12/property +child + object class=GtkBox id=box3 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing6/property +child + object class=GtkGrid id=grid1 +
Re: Crash with gnome#627420-1.ods in string related function
On Thu, 2013-01-03 at 19:44 +0200, Noel Grandin wrote: We could throw a StringAllocationFailed exception, and catch it near the bottom if the import process, and use that to indicate that the document is corrupt. Sigh - this brings us back to the old chestnut of the impact exceptions have on generated code size, and (lack of) optimisation. I had hoped that when we last discussed it we ended up with a try not to use exceptions at bazillions of call-sites approach. In this case I imagine sanity-checking the string length vs. some sane / known likely bounds might work; one upper-bound for the length of a string is presumably the size of the un-compressed .zip file. Then again your error sounds like pushing against the over-commit goodness; for which there is no real cure :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#58671: Remove accelerators from Undo action texts
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1596
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/1596/1
fdo#58671: Remove accelerators from Undo action texts
These three texts appear in Undo dropdown list, so they don't need accelerators
(cherry picked from commit 93a9e52dccf15b53fc1935145df24306e3a4fc3e)
Change-Id: Icec8e199c7cc3990b6316937e49aacb7eb1015fb
---
M editeng/source/editeng/editeng.src
M sc/source/ui/src/globstr.src
M sw/source/core/undo/undo.src
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/editeng/source/editeng/editeng.src
b/editeng/source/editeng/editeng.src
index 2bea4aa..66f6eb4 100644
--- a/editeng/source/editeng/editeng.src
+++ b/editeng/source/editeng/editeng.src
@@ -61,7 +61,7 @@
String RID_EDITUNDO_TRANSLITERATE
{
-Text [ en-US ] = ~Change Case;
+Text [ en-US ] = Change Case;
};
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 79ad06e..a5ac8b2 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -354,7 +354,7 @@
};
String STR_UNDO_TRANSLITERATE
{
-Text [ en-US ] = ~Change Case;
+Text [ en-US ] = Change Case;
};
String STR_DBNAME_IMPORT
{
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index aebd3b8..d5c1ac4 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -267,7 +267,7 @@
String STR_TRANSLITERATE
{
-Text [ en-US ] = ~Change Case;
+Text [ en-US ] = Change Case;
};
String STR_DELNUM
--
To view, visit https://gerrit.libreoffice.org/1596
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icec8e199c7cc3990b6316937e49aacb7eb1015fb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Korrawit Pruegsanusak detective.conan.1...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix Writer table functions printed wrongly
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1597
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/1597/1
fix Writer table functions printed wrongly
This patch fixes fdo#58074: Writer table functions are not calculated
before printing.
Change-Id: Idd3a634f1e8a1f97e4ee8359a11da9793f9ac307
---
M sw/source/core/doc/docfld.cxx
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 3fe8a0b..14a5a4f 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -347,7 +347,9 @@
if( !pNewHt )
break;
default:
-(*pFldTypes)[i]-ModifyNotification ( 0, pNewHt );
+if( pNewHt ) {
+(*pFldTypes)[i]-ModifyNotification ( 0, pNewHt );
+}
}
}
--
To view, visit https://gerrit.libreoffice.org/1597
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd3a634f1e8a1f97e4ee8359a11da9793f9ac307
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Tim Hardeck thard...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#54165: Allow localized shortcut names on Windows
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1553 -- To view, visit https://gerrit.libreoffice.org/1553 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2de53cd8d888ecf819271e96f8eb2cc4a90e554d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jesús Corrius jcorr...@gmail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source sd/source
sc/source/filter/xml/xmlwrap.cxx |4 ++--
sc/source/ui/docshell/docsh.cxx |2 +-
sc/source/ui/docshell/docsh8.cxx |4 ++--
sd/source/filter/xml/sdxmlwrp.cxx |4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 371727c78fdfd80b4d4ec33dc2129da96c38e777
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 8 12:59:15 2013 +0100
DynamicErrorInfo objects must be allocated on the heap
cf. delete pInfo; in ErrorHandler::HandleError_Impl
(tools/source/ref/errinf.cxx). This reverts the remaining (non UNO related)
changes from e48d47469508dee55ae6abcb3988222b5612e1e9 fix some memory
leaks in
sc and 5ea7e74c29f7279b6c31d38185ace576f68f4fb2 fix some memory leaks in
sd
that had not already been reverted. Whether any of these instantiations are
really leaked (i.e., never deleted again in calls to
ErrorHandler::HandleError_Impl) is unclear to me, but that would need to be
fixed in a different way.
Change-Id: I6d9e7a2f6fce6d6a4d5d390c09a5a12f593028a6
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 439e5e6..5913788 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -219,7 +219,7 @@ sal_uInt32
ScXMLImportWrapper::ImportFromComponent(uno::Referencelang::XMultiSe
if( !sDocName.isEmpty() )
{
-nReturn = TwoStringErrorInfo(
+nReturn = *new TwoStringErrorInfo(
(bMustBeSuccessfull ? SCERR_IMPORT_FILE_ROWCOL
:
SCWARN_IMPORT_FILE_ROWCOL),
sDocName, sErr,
@@ -228,7 +228,7 @@ sal_uInt32
ScXMLImportWrapper::ImportFromComponent(uno::Referencelang::XMultiSe
else
{
OSL_ENSURE( bMustBeSuccessfull, Warnings are not supported );
-nReturn = StringErrorInfo( SCERR_IMPORT_FORMAT_ROWCOL, sErr,
+nReturn = *new StringErrorInfo( SCERR_IMPORT_FORMAT_ROWCOL,
sErr,
ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR );
}
}
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 37e5e64..f910070 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2293,7 +2293,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium rMed )
aImExport.SetStreamPath( rMed.GetName() );
bRet = aImExport.ExportStream( *pStream, rMed.GetBaseURL( true ),
SOT_FORMATSTR_ID_HTML );
if ( bRet aImExport.GetNonConvertibleChars().Len() )
-SetError( StringErrorInfo(
+SetError( *new StringErrorInfo(
SCWARN_EXPORT_NONCONVERTIBLE_CHARS,
aImExport.GetNonConvertibleChars(),
ERRCODE_BUTTON_OK | ERRCODE_MSG_INFO ), ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index af33ea2..2bfbcb0 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -1156,12 +1156,12 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString
rFullFileName, CharSet e
}
String sPosition( ScAddress( nDocCol, nDocRow,
nTab).GetColRowString());
String sEncoding( SvxTextEncodingTable().GetTextString( eCharSet));
-nErr = TwoStringErrorInfo( (bEncErr ? SCERR_EXPORT_ENCODING :
+nErr = *new TwoStringErrorInfo( (bEncErr ? SCERR_EXPORT_ENCODING :
SCERR_EXPORT_FIELDWIDTH), sPosition, sEncoding,
ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR);
}
else if ( !aException.Message.isEmpty() )
-nErr = StringErrorInfo( (SCERR_EXPORT_SQLEXCEPTION),
aException.Message, ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR);
+nErr = *new StringErrorInfo( (SCERR_EXPORT_SQLEXCEPTION),
aException.Message, ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR);
else
nErr = SCERR_EXPORT_DATA;
}
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx
b/sd/source/filter/xml/sdxmlwrp.cxx
index 285af43..4020a62 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -282,7 +282,7 @@ sal_Int32 ReadThroughComponent(
if( rStreamName.Len() )
{
-return TwoStringErrorInfo(
+return *new TwoStringErrorInfo(
(bMustBeSuccessfull ? ERR_FORMAT_FILE_ROWCOL
: WARN_FORMAT_FILE_ROWCOL),
rStreamName, sErr,
@@ -291,7 +291,7 @@ sal_Int32 ReadThroughComponent(
else
{
DBG_ASSERT( bMustBeSuccessfull, Warnings are not supported );
-return StringErrorInfo( ERR_FORMAT_ROWCOL, sErr,
+return *new
Re: [libreoffice-l10n] [ANN] LibreOffice 4.0.0 Beta2 available
On 12/23/2012 01:46 PM, Serg Bormant wrote: After removing component loader=com.sun.star.loader.SharedLibrary prefix=ucpgvfs1 uri=vnd.sun.star.expand:$LO_LIB_DIR/ucpgvfs1.uno.so implementation name=com.sun.star.comp.GnomeVFSContentProvider service name=com.sun.star.ucb.GnomeVFSContentProvider/ /implementation /component from /opt/lodev4.0/program/services/services.rdb and starting /opt/lodev4.0/program/soffice again message box appears: LOdev 4.0 - Fatal Error The application cannot be started. unsatisfied query for interface of type com.sun.star.ucb.XContentProvider! OK Expected behavior: application starts. FYI, mention of GnomeVFSContentProvider would also need to be removed from the /org.openoffice.ucb.Configuration/ContentProviders/Local/SecondaryKeys/Office/ProviderData configuration list in the LO installation's share/registry/main.xcd. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: Use MSBuild from .NET Framework 4.0
Tor Lillqvist has abandoned this change. Change subject: Use MSBuild from .NET Framework 4.0 .. Patch Set 1: Abandoned . -- To view, visit https://gerrit.libreoffice.org/1591 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I20ea889537badf2713101b3296604a855451ae2f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Tor Lillqvist t...@iki.fi Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - vcl/inc vcl/Library_vcl.mk vcl/win
vcl/Library_vcl.mk |1
vcl/inc/win/salframe.h |7 ++
vcl/win/source/window/keynames.cxx | 112 +
vcl/win/source/window/salframe.cxx | 38
4 files changed, 145 insertions(+), 13 deletions(-)
New commits:
commit 54e71086799b5f40f6a36bb453ab218fa1f44eb9
Author: Jesús jcorr...@gmail.com
Date: Sun Jan 6 00:29:45 2013 +0100
fdo#54165: Allow localized shortcut names on Windows
Change-Id: I2de53cd8d888ecf819271e96f8eb2cc4a90e554d
Reviewed-on: https://gerrit.libreoffice.org/1554
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 57fd4cf..c7249bb 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -618,6 +618,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/win/source/gdi/winlayout \
vcl/win/source/gdi/wntgdi \
vcl/win/source/window/salframe \
+vcl/win/source/window/keynames \
vcl/win/source/window/salmenu \
vcl/win/source/window/salobj \
))
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 4c0f63c..54e10bd 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -137,6 +137,13 @@ public:
void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect );
+// get foreign key names
+namespace vcl_sal {
+rtl::OUString getKeysReplacementName(
+rtl::OUString pLang,
+LONG nSymbol );
+}
+
#endif // _SV_SALFRAME_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/window/keynames.cxx
b/vcl/win/source/window/keynames.cxx
new file mode 100755
index 000..153fc07
--- /dev/null
+++ b/vcl/win/source/window/keynames.cxx
@@ -0,0 +1,112 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include string.h
+#include rtl/ustring.hxx
+#include sal/macros.h
+
+#include windows.h
+
+#define KEY_ESC 0x1
+#define KEY_BACK0xE
+#define KEY_ENTER 0x1C
+#define KEY_SPACEBAR0x39
+#define KEY_HOME0x147
+#define KEY_UP 0x148
+#define KEY_PAGEUP 0x149
+#define KEY_LEFT0x14B
+#define KEY_RIGHT 0x14D
+#define KEY_END 0x14F
+#define KEY_DOWN0x150
+#define KEY_PAGEDOWN0x151
+#define KEY_INSERT 0x152
+#define KEY_DELETE 0x153
+#define KEY_CONTROL 0x21D
+#define KEY_SHIFT 0x22A
+#define KEY_ALT 0x238
+
+
+namespace vcl_sal {
+
+struct KeysNameReplacement
+{
+LONGaSymbol;
+const char* pName;
+};
+
+struct KeyboardReplacements
+{
+const char* pLangName;
+const KeysNameReplacement* pReplacements;
+int nReplacements;
+};
+
+//
+//
+// CAUTION CAUTION CAUTION
+// every string value in the replacements tables must be in UTF8
+// be careful with your editor !
+//
+//
+
+static const struct KeysNameReplacement aImplReplacements_Catalan[] =
+{
+{ KEY_BACK, Retrocés },
+{ KEY_ENTER, Retorn },
+{ KEY_SPACEBAR, Espai },
+{ KEY_HOME, Inici },
+{ KEY_UP, Amunt },
+{ KEY_PAGEUP, Re PÃ g },
+{ KEY_LEFT, Esquerra },
+{ KEY_RIGHT, Dreta },
+{ KEY_END, Fi },
+{ KEY_DOWN, Avall },
+{ KEY_PAGEDOWN, Av PÃ g },
+{ KEY_INSERT, Ins },
+{ KEY_DELETE, Supr },
+{ KEY_SHIFT, Maj },
+};
+
+static const struct KeyboardReplacements aKeyboards[] =
+{
+{ ca, aImplReplacements_Catalan,
SAL_N_ELEMENTS(aImplReplacements_Catalan) },
+};
+
+// translate keycodes, used within the displayed menu shortcuts
+rtl::OUString getKeysReplacementName( rtl::OUString pLang, LONG nSymbol )
+{
+for( unsigned int n = 0; n SAL_N_ELEMENTS(aKeyboards); n++ )
+{
+
[PUSHED] Change in core[libreoffice-4-0]: fdo#54165: Allow localized shortcut names on Windows
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1554 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1554 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2de53cd8d888ecf819271e96f8eb2cc4a90e554d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Jesús Corrius jcorr...@gmail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - distro-configs/LibreOfficeLinux.conf
distro-configs/LibreOfficeLinux.conf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7389260dbf73aa88f8db18d04547c72a51f7d0e7 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Jan 8 14:13:05 2013 +0100 Disable gnome-vfs for now Change-Id: Id02270bad13ba575e7818c714d4920be604f2c1c diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 4ed55ee..46bad19 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -27,7 +27,7 @@ --enable-kde --enable-gstreamer-0-10 --enable-evolution2 ---enable-gnome-vfs +--disable-gnome-vfs --enable-scripting-beanshell --enable-scripting-javascript --enable-ext-wiki-publisher ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW] domain-mapper import speedup patch ...
On 21/12/12 17:55, Michael Meeks wrote:
There are probably better ways to do this :-) clearly it would be nice
to manage layered SfxItemSets via UNO in an even more performant and
elegant way that doesn't rely on great big uno PropertyValue sequences
getting sent repeatedly and so on. Anyhow the attached gives a
reasonable win on RTF import: 25% faster or so. It's hard to see how it
could make things much perform worse.
wow - i've always suspected that it's unnecessarily slow to set these
items in the model one at a time, when there is a InsertItemSet
available, but 25% faster import with this single change is impressive.
there may be more places where a similar approach could be applicable,
both in API implementations in sw and in writerfilter/xmloff import
code, e.g. see cc99bb9f383a65912d004e227a5b6a88b401bbba which was purely
result of me debugging some crash and wondering why a certain insert
method in sw core is called so often (in that case sw API impl. actually
did the right thing).
It has a FIXME - I'm unclear
exactly what's going on there. Clearly I'm wandering at the edge of my
competence wrt. the writer bits here, so help/encouragement appreciated.
+// FIXME: unclear that we need to do this really ...
+if (!rCursorMap.getByName(
rCharacterAndParagraphProperties[nProp].Name ))
{
-sMessage = rIllegal.Message;
bIllegalException = true;
i suppose this exception would be thrown by
SwUnoCursorHelper::SetPropertyValues now anyway... which is actually a
problem because in that case
m_pImpl-m_pDoc-GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, NULL);
won't be executed and we get a confused UNDO stack in writer...
i guess it's best to move the Start/EndUndo into
SwUnoCursorHelper::SetPropertyValues to fix that (can't be omitted
entirely since it's possible that multiple different Undo objects are
created).
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 4 commits - sw/inc sw/qa sw/source writerfilter/source
sw/inc/IDocumentSettingAccess.hxx |1 +
sw/inc/doc.hxx |1 +
sw/qa/extras/inc/swmodeltestbase.hxx|7 +--
sw/qa/extras/ooxmlimport/data/n793998.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx| 12
sw/source/core/doc/doc.cxx |5 +
sw/source/core/doc/docnew.cxx |1 +
sw/source/core/text/txttab.cxx |7 +--
sw/source/filter/ww8/ww8par.cxx |1 +
sw/source/filter/xml/xmlimp.cxx |7 +++
sw/source/ui/uno/SwXDocumentSettings.cxx| 16 +++-
writerfilter/source/filter/ImportFilter.cxx |1 +
12 files changed, 54 insertions(+), 5 deletions(-)
New commits:
commit d7853c1fab14c943b6b2535580f64810b22e225d
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jan 8 12:56:24 2013 +0100
n#793998 testcase
diff --git a/sw/qa/extras/ooxmlimport/data/n793998.docx
b/sw/qa/extras/ooxmlimport/data/n793998.docx
new file mode 100755
index 000..fc96e2e
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n793998.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 813b653..28db45e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -112,6 +112,7 @@ public:
void testFineTableDash();
void testN792778();
void testN793262();
+void testN793998();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -176,6 +177,7 @@ void Test::run()
{tableborder-finedash.docx, Test::testFineTableDash},
{n792778.docx, Test::testN792778},
{n793262.docx, Test::testN793262},
+{n793998.docx, Test::testN793998},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1114,6 +1116,16 @@ void Test::testN793262()
CPPUNIT_ASSERT_EQUAL(sal_Int32(76),
getPropertysal_Int32(xTable-getCellByName(A1), TopBorderDistance));
}
+void Test::testN793998()
+{
+sal_Int32 nTextPortion = parseDump(/root/page/body/txt/Text[1],
nWidth).toInt32(); // Width of the first (text) portion
+sal_Int32 nTabPortion = parseDump(/root/page/body/txt/Text[2],
nWidth).toInt32(); // Width of the second (tab) portion
+sal_Int32 nParagraph = parseDump(/root/page/body/txt/infos/bounds,
width).toInt32(); // Width of the paragraph
+sal_Int32 nRightMargin = 3000;
+// The problem was that the tab portion didn't ignore the right margin, so
text + tab width wasn't larger than body (paragraph - right margin) width.
+CPPUNIT_ASSERT(nTextPortion + nTabPortion nParagraph - nRightMargin);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
commit bdfc6363d66aa079512cc8008996b633f693fed1
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jan 8 11:57:13 2013 +0100
n#793998 sw: add TabOverMargin compat mode
In case the right margin is larger then the tab position (e.g. the right
margin of 7cm, there is a tab position at 16cm and right margin begins
at 9cm), we have a conflicting case. In Word, the tab has priority, so
in this conflicting case, the text can be outside the specified margin.
In Writer, the right margin has priority. Add a compat flag to let
the tab have priority in Writer as well for Word formats.
This is similar to TabOverflow, but that was only applied to left tabs
and only in case there were no characters after the tabs in the
paragraph.
diff --git a/sw/inc/IDocumentSettingAccess.hxx
b/sw/inc/IDocumentSettingAccess.hxx
index 2c02236..8214f1a 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -77,6 +77,7 @@ namespace com { namespace sun { namespace star { namespace
i18n { struct Forbidd
UNBREAKABLE_NUMBERINGS,
CLIPPED_PICTURES,
BACKGROUND_PARA_OVER_DRAWINGS,
+ TAB_OVER_MARGIN,
// COMPATIBILITY FLAGS END
BROWSE_MODE,
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ef40d44..c67f79f 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -578,6 +578,7 @@ private:
bool mbUnbreakableNumberings;
bool mbClippedPictures;
bool mbBackgroundParaOverDrawings;
+bool mbTabOverMargin;
bool mbLastBrowseMode : 1;
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index dda0b6d..80cfa84 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -192,6 +192,7 @@ bool SwDoc::get(/*[in]*/ DocumentSettingId id) const
case UNBREAKABLE_NUMBERINGS: return mbUnbreakableNumberings;
case CLIPPED_PICTURES: return mbClippedPictures;
case BACKGROUND_PARA_OVER_DRAWINGS: return
mbBackgroundParaOverDrawings;
+case TAB_OVER_MARGIN: return mbTabOverMargin;
case BROWSE_MODE: return mbLastBrowseMode; // Attention: normally the
ViewShell has to be asked!
Re: Crash with gnome#627420-1.ods in string related function
Hello Michael,
Reading this thread, I took a look at sal/rtl/source/strtmpl.cxx
969 static IMPL_RTL_STRINGDATA* IMPL_RTL_STRINGNAME( ImplAlloc )(
sal_Int32 nLen )
970 {
971 IMPL_RTL_STRINGDATA * pData
972 = (sal::static_int_cast sal_uInt32 (nLen)
973= ((SAL_MAX_UINT32 - sizeof (IMPL_RTL_STRINGDATA))
974/ sizeof (IMPL_RTL_STRCODE)))
975 ? (IMPL_RTL_STRINGDATA *) rtl_allocateMemory(
976 sizeof (IMPL_RTL_STRINGDATA) + nLen * sizeof
(IMPL_RTL_STRCODE))
977 : NULL;
978 if (pData != NULL) {
979 pData-refCount = 1;
980 pData-length = nLen;
981 pData-buffer[nLen] = 0;
982 }
983 return pData;
984 }
Since we cast nLen parameter in sal_uInt32, could it help to add an
assert about nLen should be = 0 ?
Of course, we don't expect a length to be negative but perhaps this function
is called with a negative value in very specific cases.
(advantage of the assert, it costs nothing in non debug)
Julien
--
View this message in context:
http://nabble.documentfoundation.org/Re-Crash-with-gnome-627420-1-ods-in-string-related-function-tp4027116p4027774.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - Makefile.top solenv/bin solenv/inc
Makefile.top |8 +-
solenv/bin/modules/installer/download.pm | 108 +++
solenv/inc/installationtest.mk |6 -
3 files changed, 48 insertions(+), 74 deletions(-)
New commits:
commit ba558a26bc93c0200d7d8bcc19a6e201d69792e4
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jan 8 11:54:15 2013 +0100
more easier and better sortable download names
+ get rid of install_multi
+ move SDK and Test from the main name to the name suffix;
use same position as helppack and langpack
+ move the content type identification arc/deb/rpm just
after the arch string
+ use archive instead of the unclear arc content identification
The new names look like:
LibreOffice_version_os_arch_content
LibreOffice_version_os_arch_content_helppack_lang
LibreOffice_version_os_arch_content_langpack_lang
LibreOffice_version_os_arch_content_sdk
LibreOffice_version_os_arch_content_test
, where the string _content is one of _archive, _deb, _rpm.
This string is missing for .msi, and .dmg installers because
the content is described by the filename suffix.
Change-Id: Ifecf947ba32e3381ef284d433096f7b37a02e9f5
diff --git a/Makefile.top b/Makefile.top
index 3dabd7f..1cbaf60 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -282,8 +282,8 @@ dev-install: build
@mkdir $(DEVINSTALLDIR)
ifeq ($(OS_FOR_BUILD),WNT)
cd instsetoo_native unset MAKEFLAGS $(SOLARENV)/bin/build.pl
LIBO_DEV_INSTALL=TRUE
- unzip -q -d $(DEVINSTALLDIR)
$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_install-arc_en-US.zip
- mv $(DEVINSTALLDIR)/LibreOffice*_install-arc_en-US/*
$(DEVINSTALLDIR)/opt
+ unzip -q -d $(DEVINSTALLDIR)
$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_archive.zip
+ mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt
else
ifeq ($(DISABLE_LINKOO),TRUE)
@ooinstall $(DEVINSTALLDIR)/opt
@@ -309,8 +309,8 @@ install-tb:
@mkdir $(DEVINSTALLDIR)
ifeq ($(OS_FOR_BUILD),WNT)
cd instsetoo_native unset MAKEFLAGS $(SOLARENV)/bin/build.pl
LIBO_DEV_INSTALL=TRUE
- unzip -q -d $(DEVINSTALLDIR)
$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_install-arc_en-US.zip
- mv $(DEVINSTALLDIR)/LibreOffice*_install-arc_en-US/*
$(DEVINSTALLDIR)/opt
+ unzip -q -d $(DEVINSTALLDIR)
$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_archive.zip
+ mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt
else
@ooinstall $(DEVINSTALLDIR)/opt
@install-gdb-printers
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 97d29a8..9a8ae38 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -298,9 +298,18 @@ sub get_downloadname_language
$languages =~ s/_en-US//;
}
+# do not list languages if there are too many
if ( length ($languages) $installer::globals::max_lang_length )
{
-$languages = 'multi';
+$languages = '';
+}
+
+# do not list pure en-US, except for helppack and langpack
+if ( ( $languages eq en-US )
+ ( ! $installer::globals::languagepack )
+ ( ! $installer::globals::helppack ) )
+{
+$languages = '';
}
return $languages;
@@ -320,20 +329,8 @@ sub get_downloadname_productname
if ( $allvariables-{'PRODUCTNAME'} eq LOdev ) { $start = LibO-Dev; }
-if (( $allvariables-{'PRODUCTNAME'} eq LibreOffice ) (
$allvariables-{'POSTVERSIONEXTENSION'} eq SDK )) { $start =
LibreOffice-SDK; }
-
-if (( $allvariables-{'PRODUCTNAME'} eq LOdev ) (
$allvariables-{'POSTVERSIONEXTENSION'} eq SDK )) { $start = LibO-Dev-SDK; }
-
-if (( $allvariables-{'PRODUCTNAME'} eq LibreOffice ) (
$allvariables-{'POSTVERSIONEXTENSION'} eq TEST )) { $start =
LibreOffice-Test; }
-
-if (( $allvariables-{'PRODUCTNAME'} eq LOdev ) (
$allvariables-{'POSTVERSIONEXTENSION'} eq TEST )) { $start =
LibO-Dev-Test; }
-
-if ( $allvariables-{'PRODUCTNAME'} eq URE ) { $start =
LibreOffice-URE; }
-
if ( $allvariables-{'PRODUCTNAME'} eq OxygenOffice ) { $start = OOOP;
}
-
-
return $start;
}
@@ -443,69 +440,46 @@ sub get_install_type
my $type = ;
-if ( $installer::globals::languagepack )
+# content type included in the installer
+if ( $installer::globals::isrpmbuild )
{
-$type = langpack;
-
-if ( $installer::globals::isrpmbuild )
-{
-$type = $type . -rpm;
-}
+$type .= rpm;
+}
+elsif ( $installer::globals::isdebbuild )
+{
+$type .= deb;
+}
+elsif ( $installer::globals::packageformat eq archive )
+{
+$type .= archive;
+}
Re: [PATCH] Simplify MigrationImpl::subtract in desktop
On 12/28/2012 06:49 PM, julien2412 wrote: By reading the function MigrationImpl::subtract in desktop/source/migration/migration.cxx, see http://opengrok.libreoffice.org/xref/core/desktop/source/migration/migration.cxx#847 I thought about this patch to use set_difference desktop_patch.txt http://nabble.documentfoundation.org/file/n4026318/desktop_patch.txt The original code is broken to begin with, as it ignores the return values from the std::unique calls, so excess elements remain at the end of va and vb. However, the patch is also broken: * Why vb.end()+5? * The output range of std::set_difference must not overlap with either input range. * The return value of std::set_difference must be observed, to cut off excess elements at the end of the returned range. * If va contains m identical elements and vb contains n m elements identical to them, m - n of those elements will remain in the output of std::set_difference, so avoiding std::unique is unsound here. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Translation of the names of the keys on Windows
Hi all, Since today it's possible to provide custom translations of the names of the keys on Windows. This is useful because Windows gets the name of the key from the keyboard layout and, in some cases, they don't match properly. For example, Catalan users don't have a proper keyboard layout (well, they do have one but it's just an alias for the Spanish keyboard) so if a user uses the Spanish or French keyboard, the name of the keys in the UI will be in Spanish or French, but never in Catalan. I am sure other languages have this problem too. So it's now possible to provide custom names for keys for Windows using the same way we do for Linux. The file to modify is the following one and the process is exactly the same: http://cgit.freedesktop.org/libreoffice/core/tree/vcl/win/source/window/keynames.cxx If you want to implement this, but you are not a developer, just send me the name of the keys with its translation and I will apply the changes myself. Thanks and Happy 2013 to everybody! -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[RESOLVED/INVALID] Re: [PATCH] Simplify MigrationImpl::subtract in desktop
Hi Stephan The +5 is obviously a kind of type (certainly due to my wrong use of Vi :-)) Above the rest, I didn't think there would be these kinds of problem and must recognize I don't what to answer. So, let's bin all this. Thank you for having taken a look. Julien -- View this message in context: http://nabble.documentfoundation.org/PATCH-Simplify-MigrationImpl-subtract-in-desktop-tp4026318p4027778.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
Petr Mladek píše v Po 07. 01. 2013 v 19:10 +0100: On Thu, 2012-12-13 at 17:16 +, Michael Meeks wrote: * 4.0 pending tasks + MSI file re-name to be renamed for 4.0 LibreOffice + also rename the Linux download tar-balls (Fridrich) + and Mac packages. + causes some pain for download scripts (Thorsten) + getting installer up on download list, other shuffling is painful + LibO not a great truncation - branding-wise. I have pushed this change to master and 4.0 branch: http://cgit.freedesktop.org/libreoffice/core/commit/?id=44cd995f02d2b46e5b0bfb3cbd743a366d4284f7 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0id=6be476c04c48ff081f595b28e1eb51c94e382bb6 After discussions with Kendy, I did some bigger clean up. The target is to get easier and better sorted names. The changes are: + get rid of install_multi + move SDK and Test from the main name to the name suffix; use same position as helppack and langpack + move the content type identification arc/deb/rpm just after the arch string + use archive instead of the unclear arc content identification The new names look like: LibreOffice_version_os_arch_content LibreOffice_version_os_arch_content_helppack_lang LibreOffice_version_os_arch_content_langpack_lang LibreOffice_version_os_arch_content_sdk LibreOffice_version_os_arch_content_test , where the string _content is one of _archive, _deb, _rpm. This string is missing for .msi, and .dmg installers because the content is described by the filename suffix. See http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0id=ba558a26bc93c0200d7d8bcc19a6e201d69792e4 Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - solenv/bin
solenv/bin/modules/installer/download.pm | 53 ++-
1 file changed, 32 insertions(+), 21 deletions(-)
New commits:
commit cf24316f4b07b0a4a0ae3c1a7e8214e1630982f8
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jan 8 14:46:27 2013 +0100
clean up of the code that defines the download file names
Change-Id: I3241801d49673cac33eb923fb986c6ceb2c39503
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 9a8ae38..21bd62f 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -431,57 +431,64 @@ sub get_download_architecture
}
#
-# Setting the installation type for the download name
+# Setting the content type for the download name
#
-sub get_install_type
+sub get_download_content
{
my ($allvariables) = @_;
-my $type = ;
+my $content = ;
# content type included in the installer
if ( $installer::globals::isrpmbuild )
{
-$type .= rpm;
+$content = rpm;
}
elsif ( $installer::globals::isdebbuild )
{
-$type .= deb;
+$content = deb;
}
elsif ( $installer::globals::packageformat eq archive )
{
-$type .= archive;
+$content = archive;
}
-$type .= _ if ($type);
+return $content;
+}
+
+#
+# Setting the functionality type for the download name
+#
+
+sub get_download_functionality
+{
+my ($allvariables) = @_;
+
+my $functionality = ;
-# functionality type
if ( $installer::globals::languagepack )
{
-$type .= langpack;
+$functionality = langpack;
}
elsif ( $installer::globals::helppack )
{
-$type .= helppack;
+$functionality = helppack;
}
elsif ( $allvariables-{'POSTVERSIONEXTENSION'} eq SDK )
{
-$type .= sdk;
+$functionality = sdk;
}
elsif ( $allvariables-{'POSTVERSIONEXTENSION'} eq TEST )
{
-$type .= test;
+$functionality = test;
}
elsif ( $allvariables-{'PRODUCTNAME'} eq URE )
{
-$type .= ure;
+$functionality = ure;
}
-# get rid of trailing _ if functionality type was not set
-$type =~ s/\_$//;
-
-return $type;
+return $functionality;
}
###
@@ -498,21 +505,25 @@ sub set_download_filename
my $versionstring = get_download_version($allvariables);
my $platform = get_download_platformname();
my $architecture = get_download_architecture();
-my $type = get_install_type($allvariables);
+my $content = get_download_content($allvariables);
+my $functionality = get_download_functionality($allvariables);
my $language = get_downloadname_language($languagestringref);
# Setting the extension happens automatically
-my $filename = $start . _ . $versionstring . _ . _ . $platform . _
. $architecture . _ . $type . _ . $language;
+my $filename = $start . _ . $versionstring . _ . $platform . _ .
$architecture . _ . $content . _ . $functionality . _ . $language;
-$filename =~ s/\_\_/\_/g; # necessary, if $versionstring or $platform or
$language are empty
-$filename =~ s/\_\s*$//;# necessary, if $language and $addon are empty
+# get rid of duplicit _ delimiters when some strings are empty
+$filename =~ s/\_\_\_/\_/g;
+$filename =~ s/\_\_/\_/g;
+$filename =~ s/\_\s*$//;
$installer::globals::ooodownloadfilename = $filename;
return $filename;
}
+
#
# Creating a tar.gz file
#
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Translation of the names of the keys on Windows
So it's now possible to provide custom names for keys for Windows using the same way we do for Linux. But what if the physical keyboards for the non-English language still have the Ctrl, Home etc texts untranslated? This is the case for the Swedish/Finnish keyboard, for instance. (And I doubt anybody is complaining...) As I am certainly not a typical user myself, I have no idea if a typical user here is more confused by seeing a shortcut key called Ohjaus+S or Ctrl+S. Hmm, at least in a Swedish XP virtual machine (the only localised Windows I have), the shortcuts in for example Notepad are shown like Ctrl+S, so I guess for Swedish the convention is to use the same text as on the physical keyboard. Apple gets around the problem by using symbols for their shift, ctrl, alt and cmd keys in shortcut descriptions in menus etc;) (See http://support.apple.com/kb/HT1343 ) . Do the Catalan keyboards have the Ctrl etc texts in Catalan? If not, isn't it counter-productive to use a different text in shortcut names? But I guess national pride goes before usability? (/me hides) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/inc sw/source writerfilter/source
sw/inc/IDocumentSettingAccess.hxx |1 +
sw/inc/doc.hxx |1 +
sw/source/core/doc/doc.cxx |5 +
sw/source/core/doc/docnew.cxx |1 +
sw/source/core/text/txttab.cxx |5 -
sw/source/filter/ww8/ww8par.cxx |1 +
sw/source/filter/xml/xmlimp.cxx |7 +++
sw/source/ui/uno/SwXDocumentSettings.cxx| 16 +++-
writerfilter/source/filter/ImportFilter.cxx |1 +
9 files changed, 36 insertions(+), 2 deletions(-)
New commits:
commit 908bcce46c54e16b32dffef34d34f21878d4
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jan 8 11:57:13 2013 +0100
n#793998 sw: add TabOverMargin compat mode
In case the right margin is larger then the tab position (e.g. the right
margin of 7cm, there is a tab position at 16cm and right margin begins
at 9cm), we have a conflicting case. In Word, the tab has priority, so
in this conflicting case, the text can be outside the specified margin.
In Writer, the right margin has priority. Add a compat flag to let
the tab have priority in Writer as well for Word formats.
This is similar to TabOverflow, but that was only applied to left tabs
and only in case there were no characters after the tabs in the
paragraph.
(cherry picked from commit bdfc6363d66aa079512cc8008996b633f693fed1)
diff --git a/sw/inc/IDocumentSettingAccess.hxx
b/sw/inc/IDocumentSettingAccess.hxx
index 2c02236..8214f1a 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -77,6 +77,7 @@ namespace com { namespace sun { namespace star { namespace
i18n { struct Forbidd
UNBREAKABLE_NUMBERINGS,
CLIPPED_PICTURES,
BACKGROUND_PARA_OVER_DRAWINGS,
+ TAB_OVER_MARGIN,
// COMPATIBILITY FLAGS END
BROWSE_MODE,
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index bfe2826..34ba7df 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -578,6 +578,7 @@ private:
bool mbUnbreakableNumberings;
bool mbClippedPictures;
bool mbBackgroundParaOverDrawings;
+bool mbTabOverMargin;
bool mbLastBrowseMode : 1;
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index dda0b6d..80cfa84 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -192,6 +192,7 @@ bool SwDoc::get(/*[in]*/ DocumentSettingId id) const
case UNBREAKABLE_NUMBERINGS: return mbUnbreakableNumberings;
case CLIPPED_PICTURES: return mbClippedPictures;
case BACKGROUND_PARA_OVER_DRAWINGS: return
mbBackgroundParaOverDrawings;
+case TAB_OVER_MARGIN: return mbTabOverMargin;
case BROWSE_MODE: return mbLastBrowseMode; // Attention: normally the
ViewShell has to be asked!
case HTML_MODE: return mbHTMLMode;
@@ -347,6 +348,10 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/
bool value)
mbBackgroundParaOverDrawings = value;
break;
+case TAB_OVER_MARGIN:
+mbTabOverMargin = value;
+break;
+
// COMPATIBILITY FLAGS END
case BROWSE_MODE: //can be used temporary (load/save) when no
ViewShell is avaiable
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 730fe56..d5f55f7 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -317,6 +317,7 @@ SwDoc::SwDoc()
mbUnbreakableNumberings(false),
mbClippedPictures(false),
mbBackgroundParaOverDrawings(false),
+mbTabOverMargin(false),
mbLastBrowseMode( false ),
n32DummyCompatabilityOptions1(0),
n32DummyCompatabilityOptions2(0),
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index a83ea96..124fa8f 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -486,7 +486,10 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo rInf )
sal_Bool SwTabPortion::PostFormat( SwTxtFormatInfo rInf )
{
-const KSHORT nRight = Min( GetTabPos(), rInf.Width() );
+const bool bTabOverMargin =
rInf.GetTxtFrm()-GetTxtNode()-getIDocumentSettingAccess()-get(IDocumentSettingAccess::TAB_OVER_MARGIN);
+// If the tab position is larger than the right margin, it gets scaled
down by default.
+// However, if compat mode enabled, we allow tabs to go over the margin:
the rest of the paragraph is not broken into lines.
+const KSHORT nRight = bTabOverMargin ? GetTabPos() : Min(GetTabPos(),
rInf.Width());
const SwLinePortion *pPor = GetPortion();
KSHORT nPorWidth = 0;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 22c49fd..8760c72 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1524,6 +1524,7 @@ void SwWW8ImplReader::ImportDop()
rDoc.set(IDocumentSettingAccess::TAB_OVERFLOW, true);
[Libreoffice-commits] .: editeng/inc editeng/source sc/inc sc/qa sc/source
editeng/inc/editeng/editobj.hxx |1
editeng/source/editeng/editobj.cxx | 21 +++
editeng/source/editeng/editobj2.hxx |1
sc/inc/column.hxx |1
sc/inc/document.hxx |2
sc/inc/table.hxx|1
sc/qa/unit/data/ods/rich-text-cells.ods |binary
sc/qa/unit/subsequent_filters-test.cxx | 183
sc/source/core/data/column3.cxx | 13 ++
sc/source/core/data/document.cxx|8 +
sc/source/core/data/table2.cxx |7 +
11 files changed, 238 insertions(+)
New commits:
commit 94874973769fee81f8ab35b2aeb0dc22812a2b48
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jan 8 01:20:22 2013 -0500
Add new ods import test for rich-text cell contents.
Change-Id: I23eb8d53b8a2c48514900a5ab07ed7ec71d3ef99
diff --git a/editeng/inc/editeng/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index 2730b46..8e97b63 100644
--- a/editeng/inc/editeng/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -102,6 +102,7 @@ public:
virtual sal_BoolIsFieldObject() const;
virtual const SvxFieldItem* GetField() const;
virtual sal_BoolHasField( TypeId aType = NULL ) const;
+virtual bool HasField( sal_Int32 nType ) const = 0;
virtual SfxItemSet GetParaAttribs(size_t nPara) const;
virtual void SetParaAttribs(size_t nPara, const SfxItemSet rAttribs);
diff --git a/editeng/source/editeng/editobj.cxx
b/editeng/source/editeng/editobj.cxx
index 275aa77..56effb9 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -878,6 +878,27 @@ sal_Bool BinTextObject::HasField( TypeId aType ) const
return false;
}
+bool BinTextObject::HasField( sal_Int32 nType ) const
+{
+size_t nParagraphs = aContents.size();
+for (size_t nPara = 0; nPara nParagraphs; ++nPara)
+{
+const ContentInfo rC = aContents[nPara];
+size_t nAttrs = rC.aAttribs.size();
+for (size_t nAttr = 0; nAttr nAttrs; ++nAttr)
+{
+const XEditAttribute rAttr = rC.aAttribs[nAttr];
+if (rAttr.GetItem()-Which() != EE_FEATURE_FIELD)
+continue;
+
+const SvxFieldData* pFldData = static_castconst
SvxFieldItem*(rAttr.GetItem())-GetField();
+if (pFldData pFldData-GetClassId() == nType)
+return true;
+}
+}
+return false;
+}
+
SfxItemSet BinTextObject::GetParaAttribs(size_t nPara) const
{
const ContentInfo rC = aContents[nPara];
diff --git a/editeng/source/editeng/editobj2.hxx
b/editeng/source/editeng/editobj2.hxx
index 4b89ade..52821c0 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -233,6 +233,7 @@ public:
virtual sal_BoolIsFieldObject() const;
virtual const SvxFieldItem* GetField() const;
virtual sal_BoolHasField( TypeId Type = NULL ) const;
+virtual bool HasField( sal_Int32 nType ) const;
virtual SfxItemSet GetParaAttribs(size_t nPara) const;
virtual void SetParaAttribs(size_t nPara, const SfxItemSet rAttribs);
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 7abce09..96df4d9 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -228,6 +228,7 @@ public:
voidGetString( SCROW nRow, rtl::OUString rString ) const;
voidGetInputString( SCROW nRow, rtl::OUString rString ) const;
double GetValue( SCROW nRow ) const;
+const EditTextObject* GetEditText( SCROW nRow ) const;
voidGetFormula( SCROW nRow, rtl::OUString rFormula ) const;
CellTypeGetCellType( SCROW nRow ) const;
SCSIZE GetCellCount() const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 5b5a472..a72f759 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -144,6 +144,7 @@ class ScProgress;
class SvtListener;
class ScNotes;
class ScEditDataArray;
+class EditTextObject;
namespace com { namespace sun { namespace star {
namespace lang {
@@ -772,6 +773,7 @@ public:
SC_DLLPUBLIC double GetValue( const ScAddress );
SC_DLLPUBLIC double GetValue( const SCCOL nCol, SCROW nRow, SCTAB
nTab) { ScAddress aAdr(nCol, nRow, nTab); return GetValue(aAdr);}
SC_DLLPUBLIC void GetValue( SCCOL nCol, SCROW nRow, SCTAB nTab,
double rValue );
+SC_DLLPUBLIC const EditTextObject* GetEditText( const ScAddress rPos )
const;
SC_DLLPUBLIC double RoundValueAsShown( double fVal, sal_uLong
nFormat );
SC_DLLPUBLIC void GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB
nTab,
sal_uInt32 rFormat ) const;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 512dee2..fa03a7f 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -310,6 +310,7 @@ public:
0.0;
}
double GetValue( SCCOL nCol,
[REVIEW] LATE FEATURE: Personas in LibreOffice
Hi there, I had a quick read; it -looks- rather low-touch - and the graphic effect is really pleasant; so I'd be well up for merging this. ( git --no-pager log --numstat -u 255c03d6ad4ed13c456ee621e0af765684a475d2~..4a4627eba410df933d004170d9f5638526acaed2 ; git --no-pager log --numstat -u 540f090a68ae4375a36d0ee6dfbb4a82f28ac704~..540f090a68ae4375a36d0ee6dfbb4a82f28ac704 ; git --no-pager log --numstat -u c223e5ff859171adab1597025b30ec2501fc5771~..3f3d0c52ae29b6ab6b2c10a5557714361aa76a26 ) | less IIRC we had this feature already for 4.0 for Windows, and this extends it to Linux+Mac. Having seen some oddness around transparency for Mac in the past, it would be worth testing there. But +1 from me for the -4-0 branch - assuming we can get another couple of reviews. As a quibble, I'd prefer to see BitmapEx's instead of BitmapEx*'s being used in the settings - which would simplify the code and make it less error prone I suspect; BitmapEx::IsEmpty is your friend :-) Otherwise, really nice work ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Crash with gnome#627420-1.ods in string related function
On Tue, 2013-01-08 at 05:19 -0800, julien2412 wrote: Hello Michael, Reading this thread, I took a look at sal/rtl/source/strtmpl.cxx 969 static IMPL_RTL_STRINGDATA* IMPL_RTL_STRINGNAME( ImplAlloc )( sal_Int32 nLen ) ... Since we cast nLen parameter in sal_uInt32, could it help to add an assert about nLen should be = 0 ? Sounds great to me :-) lots of code paths to there check for a positive length I guess some mass code clean to use sal_uInt32 instead of sal_Int32 for string lengths might be in order at some stage - though perhaps there is some reason that's not obvious to me for strings to have a signed length and to check for it to be 0 around the place: perhaps for some insertion/offset API semantic corner-case reason ? 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] .: Branch 'distro/suse/suse-3.6' - sw/inc sw/source writerfilter/source
sw/inc/IDocumentSettingAccess.hxx |1 +
sw/inc/doc.hxx |1 +
sw/source/core/doc/doc.cxx |5 +
sw/source/core/doc/docnew.cxx |1 +
sw/source/core/text/txttab.cxx |5 -
sw/source/filter/ww8/ww8par.cxx |1 +
sw/source/filter/xml/xmlimp.cxx | 10 ++
sw/source/ui/uno/SwXDocumentSettings.cxx| 16 +++-
writerfilter/source/filter/ImportFilter.cxx |1 +
9 files changed, 39 insertions(+), 2 deletions(-)
New commits:
commit 5c65238dea9db745c6d05ac34441c35bb9677229
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jan 8 11:57:13 2013 +0100
n#793998 sw: add TabOverMargin compat mode
In case the right margin is larger then the tab position (e.g. the right
margin of 7cm, there is a tab position at 16cm and right margin begins
at 9cm), we have a conflicting case. In Word, the tab has priority, so
in this conflicting case, the text can be outside the specified margin.
In Writer, the right margin has priority. Add a compat flag to let
the tab have priority in Writer as well for Word formats.
This is similar to TabOverflow, but that was only applied to left tabs
and only in case there were no characters after the tabs in the
paragraph.
(cherry picked from commit bdfc6363d66aa079512cc8008996b633f693fed1)
Conflicts:
sw/inc/IDocumentSettingAccess.hxx
sw/inc/doc.hxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docnew.cxx
sw/source/filter/xml/xmlimp.cxx
sw/source/ui/uno/SwXDocumentSettings.cxx
writerfilter/source/filter/ImportFilter.cxx
Change-Id: Ib07abd5db1daa916b8b4d9530d09d4d0c4af026e
diff --git a/sw/inc/IDocumentSettingAccess.hxx
b/sw/inc/IDocumentSettingAccess.hxx
index ac5770b..3042f8a 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -86,6 +86,7 @@ namespace com { namespace sun { namespace star { namespace
i18n { struct Forbidd
UNBREAKABLE_NUMBERINGS,
BACKGROUND_PARA_OVER_DRAWINGS,
CLIPPED_PICTURES,
+ TAB_OVER_MARGIN,
// COMPATIBILITY FLAGS END
BROWSE_MODE,
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 1f269bf..caf0eb6 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -592,6 +592,7 @@ private:
bool mbUnbreakableNumberings;
bool mbBackgroundParaOverDrawings;
bool mbClippedPictures;
+bool mbTabOverMargin;
bool mbLastBrowseMode : 1;
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 07eaa49..5f9461b 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -201,6 +201,7 @@ bool SwDoc::get(/*[in]*/ DocumentSettingId id) const
case UNBREAKABLE_NUMBERINGS: return mbUnbreakableNumberings;
case BACKGROUND_PARA_OVER_DRAWINGS: return
mbBackgroundParaOverDrawings;
case CLIPPED_PICTURES: return mbClippedPictures;
+case TAB_OVER_MARGIN: return mbTabOverMargin;
case BROWSE_MODE: return mbLastBrowseMode; // Attention: normally the
ViewShell has to be asked!
case HTML_MODE: return mbHTMLMode;
@@ -352,6 +353,10 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/
bool value)
mbClippedPictures = value;
break;
+case TAB_OVER_MARGIN:
+mbTabOverMargin = value;
+break;
+
// COMPATIBILITY FLAGS END
case BROWSE_MODE: //can be used temporary (load/save) when no
ViewShell is avaiable
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 4948f24..5cbc424 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -363,6 +363,7 @@ SwDoc::SwDoc()
mbFloattableNomargins = false;
mbBackgroundParaOverDrawings= false;
mbClippedPictures = false;
+mbTabOverMargin = false;
//
// COMPATIBILITY FLAGS END
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 8841e39..798f687 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -494,7 +494,10 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo rInf )
sal_Bool SwTabPortion::PostFormat( SwTxtFormatInfo rInf )
{
-const KSHORT nRight = Min( GetTabPos(), rInf.Width() );
+const bool bTabOverMargin =
rInf.GetTxtFrm()-GetTxtNode()-getIDocumentSettingAccess()-get(IDocumentSettingAccess::TAB_OVER_MARGIN);
+// If the tab position is larger than the right margin, it gets scaled
down by default.
+// However, if compat mode enabled, we allow tabs to go over the margin:
the rest of the paragraph is not broken into lines.
+const KSHORT nRight = bTabOverMargin ? GetTabPos() : Min(GetTabPos(),
rInf.Width());
const SwLinePortion *pPor =
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/doc/templatedlg.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 7d792f39b2ca40511544c8a61d7d7f6acdd48bcf
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Jan 8 15:21:51 2013 +0100
Template Manager: fixed select template and scroll caused trouble with
toolbar
Selecting a template in the first row and scrolling down made some items
in the toolbar disappear... Fixed this by checking if the item to update
is already in the selection.
Change-Id: I2ddffae3a1c6092241afcf2acd212fe07b3a65ce
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 26cf58b..282372d 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -501,6 +501,7 @@ IMPL_LINK(SfxTemplateManagerDlg, TVFolderStateHdl, const
ThumbnailViewItem*, pIt
IMPL_LINK(SfxTemplateManagerDlg, TVTemplateStateHdl, const ThumbnailViewItem*,
pItem)
{
+bool bInSelection = maSelTemplates.find(pItem) != maSelTemplates.end();
if (pItem-isSelected())
{
if (!mbIsSaveMode)
@@ -511,7 +512,7 @@ IMPL_LINK(SfxTemplateManagerDlg, TVTemplateStateHdl, const
ThumbnailViewItem*, p
mpActionBar-Show(false);
mpTemplateBar-Show();
}
-else
+else if (maSelTemplates.size() != 1 || !bInSelection)
{
mpTemplateBar-HideItem(TBI_TEMPLATE_EDIT);
mpTemplateBar-HideItem(TBI_TEMPLATE_PROPERTIES);
@@ -519,11 +520,12 @@ IMPL_LINK(SfxTemplateManagerDlg, TVTemplateStateHdl,
const ThumbnailViewItem*, p
}
}
-maSelTemplates.insert(pItem);
+if (!bInSelection)
+maSelTemplates.insert(pItem);
}
else
{
-if (maSelTemplates.find(pItem) != maSelTemplates.end())
+if (bInSelection)
{
maSelTemplates.erase(pItem);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sfx2/inc sfx2/source
sfx2/inc/sfx2/templateabstractview.hxx |7 ++--
sfx2/inc/sfx2/templatelocalview.hxx |6 ---
sfx2/inc/sfx2/templateremoteview.hxx |2 -
sfx2/inc/sfx2/templateview.hxx | 12 --
sfx2/source/control/templateabstractview.cxx | 47 +--
sfx2/source/control/templatelocalview.cxx| 34 ---
sfx2/source/control/templateremoteview.cxx | 11 --
sfx2/source/control/templateview.cxx |5 --
sfx2/source/doc/templatedlg.cxx | 12 --
9 files changed, 64 insertions(+), 72 deletions(-)
New commits:
commit 7d620e26070fda48f91a8ebe0a088224d6d19f75
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Jan 8 15:21:51 2013 +0100
Template Manager: fixed select template and scroll caused trouble with
toolbar
Selecting a template in the first row and scrolling down made some items
in the toolbar disappear... Fixed this by checking if the item to update
is already in the selection.
Change-Id: I2ddffae3a1c6092241afcf2acd212fe07b3a65ce
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index cfb979e..80f180a 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -502,6 +502,7 @@ IMPL_LINK(SfxTemplateManagerDlg, TVFolderStateHdl, const
ThumbnailViewItem*, pIt
IMPL_LINK(SfxTemplateManagerDlg, TVTemplateStateHdl, const ThumbnailViewItem*,
pItem)
{
+bool bInSelection = maSelTemplates.find(pItem) != maSelTemplates.end();
if (pItem-isSelected())
{
if (!mbIsSaveMode)
@@ -512,7 +513,7 @@ IMPL_LINK(SfxTemplateManagerDlg, TVTemplateStateHdl, const
ThumbnailViewItem*, p
mpActionBar-Show(false);
mpTemplateBar-Show();
}
-else
+else if (maSelTemplates.size() != 1 || !bInSelection)
{
mpTemplateBar-HideItem(TBI_TEMPLATE_EDIT);
mpTemplateBar-HideItem(TBI_TEMPLATE_PROPERTIES);
@@ -520,11 +521,12 @@ IMPL_LINK(SfxTemplateManagerDlg, TVTemplateStateHdl,
const ThumbnailViewItem*, p
}
}
-maSelTemplates.insert(pItem);
+if (!bInSelection)
+maSelTemplates.insert(pItem);
}
else
{
-if (maSelTemplates.find(pItem) != maSelTemplates.end())
+if (bInSelection)
{
maSelTemplates.erase(pItem);
commit 8a2bfe697bf71c8a2ca3c6ba1ef5e6324d4163aa
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Fri Dec 21 15:37:49 2012 +0100
Templates Manager: merged the Double Click Handling into
TemplateAbstractView
Change-Id: Iafc1650d57d29fbc24921498f18da6c0e510b37a
diff --git a/sfx2/inc/sfx2/templateabstractview.hxx
b/sfx2/inc/sfx2/templateabstractview.hxx
index ca51181..a5fef71 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++ b/sfx2/inc/sfx2/templateabstractview.hxx
@@ -87,7 +87,7 @@ public:
virtual void filterTemplatesByApp (const FILTER_APPLICATION eApp);
-virtual void showOverlay (bool bVisible) = 0;
+void showOverlay (bool bVisible);
void setItemDimensions (long ItemWidth, long ThumbnailHeight, long
DisplayHeight, int itemPadding);
@@ -109,7 +109,7 @@ public:
void setOverlayItemStateHdl (const Link aLink) { maOverlayItemStateHdl =
aLink; }
-void setOverlayDblClickHdl (const Link rLink);
+void setOpenHdl (const Link rLink);
void setOverlayCloseHdl (const Link rLink);
@@ -127,10 +127,13 @@ protected:
DECL_LINK(OverlayItemStateHdl, const ThumbnailViewItem*);
+virtual void OnItemDblClicked(ThumbnailViewItem *pItem);
+
protected:
TemplateView *mpItemView;
Link maOverlayItemStateHdl;
+Link maOpenHdl;
bool mbFilteredResults; // Flag keep track if overlay has been
filtered so folders can get filtered too afterwards
FILTER_APPLICATION meFilterOption;
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx
b/sfx2/inc/sfx2/templatelocalview.hxx
index e11c42b..5c54375 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -39,8 +39,6 @@ public:
std::vectorOUString getFolderNames ();
-virtual void showOverlay (bool bVisible);
-
std::vectorTemplateItemProperties
getFilteredItems (const boost::functionbool (const
TemplateItemProperties) rFunc) const;
@@ -73,10 +71,6 @@ public:
private:
-virtual void OnItemDblClicked (ThumbnailViewItem *pRegionItem);
-
-private:
-
SfxDocumentTemplates *mpDocTemplates;
};
diff --git a/sfx2/inc/sfx2/templateremoteview.hxx
b/sfx2/inc/sfx2/templateremoteview.hxx
index bd1bf5c..b760f00 100644
--- a/sfx2/inc/sfx2/templateremoteview.hxx
+++ b/sfx2/inc/sfx2/templateremoteview.hxx
@@ -25,8 +25,6 @@ public:
virtual ~TemplateRemoteView ();
-virtual void showOverlay (bool bVisible);
-
bool loadRepository (TemplateRepository* pRepository, bool bRefresh);
[Libreoffice-commits] .: src/docrecord.py src/globals.py
src/docrecord.py |5 ++---
src/globals.py |4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 615ece27be29d28bffa139d635e421329d087ba0
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jan 8 15:32:53 2013 +0100
escaping anything under 0x20 is okay for non-doc as well
diff --git a/src/docrecord.py b/src/docrecord.py
index 09e5701..e5f29fe 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -31,7 +31,6 @@ class FcCompressed(DOCDirStream):
print '/fcCompressed'
def getTransformedValue(self, start, end, logical = True):
-lowLimit = 21 # would be only 20 by default
if self.fCompressed:
offset = self.fc/2
if logical:
@@ -40,7 +39,7 @@ class FcCompressed(DOCDirStream):
else:
fro = start
to = end
-return globals.encodeName(self.mainStream.bytes[fro:to], lowLimit
= lowLimit)
+return globals.encodeName(self.mainStream.bytes[fro:to])
else:
if logical:
offset = self.fc
@@ -49,7 +48,7 @@ class FcCompressed(DOCDirStream):
else:
fro = start
to = end
-return
globals.encodeName(self.mainStream.bytes[fro:to].decode('utf-16'), lowOnly =
True, lowLimit = lowLimit)
+return
globals.encodeName(self.mainStream.bytes[fro:to].decode('utf-16'), lowOnly =
True)
class Pcd(DOCDirStream):
The Pcd structure specifies the location of text in the WordDocument
Stream and additional properties for this text.
diff --git a/src/globals.py b/src/globals.py
index e51a846..68aae93 100644
--- a/src/globals.py
+++ b/src/globals.py
@@ -151,7 +151,7 @@ def debug (msg):
sys.stderr.write(DEBUG: %s\n%msg)
-def encodeName (name, lowOnly = False, lowLimit = 20):
+def encodeName (name, lowOnly = False, lowLimit = 0x20):
Encode name that contains unprintable characters.
n = len(name)
@@ -160,7 +160,7 @@ def encodeName (name, lowOnly = False, lowLimit = 20):
newname = ''
for i in xrange(0, n):
-if ord(name[i]) = lowLimit or ((not lowOnly) and ord(name[i]) = 127):
+if ord(name[i]) lowLimit or ((not lowOnly) and ord(name[i]) = 127):
newname += \\x%2.2X%ord(name[i])
else:
newname += name[i]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: No UNSIGNED_BYTE in Any
On 12/27/2012 03:14 PM, Lionel Elie Mamane wrote: Ideally, I'd like that we fix this in LibreOffice 4.1. The cleanest would be to add support for unsigned 8 bit integer in Any, which as far as I understand would entail: - adding typelib_TypeClass_UNSIGNED_BYTE to cppu/inc/typelib/typeclass.h - adding UNSIGNED_BYTE to udkapi/com/sun/star/uno/TypeClass.idl (published!) I'm not sure what the consequences of the latter are. E.g. do all Uno bindings/bridges/... (Java, StarBasic, Python, ...) have to be updated one by one? UNO Any can only hold certain UNO-related values, see http://www.openoffice.org/udk/common/man/typesystem.html. There is no UNSIGNED BYTE type in UNO (and there is too many different numeric types in UNO already, not too few). In general, there will always be impedance mismatch between a given type system (like the database-related stuff you quote) and UNO Any. If information about the original type system needs to be preserved in UNO Any, that original type system needs to be encoded in UNO in some way (say, by introducing structs for the various types). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/cell.hxx |3 +--
sc/source/core/data/cell2.cxx | 10 +-
sc/source/core/data/column2.cxx |3 +--
sc/source/core/data/table6.cxx|3 +--
sc/source/filter/html/htmlexp.cxx |5 ++---
sc/source/filter/rtf/rtfexp.cxx |3 +--
sc/source/filter/xml/xmlcelli.cxx |2 +-
sc/source/ui/app/transobj.cxx |3 +--
sc/source/ui/docshell/docsh.cxx |3 +--
sc/source/ui/view/gridwin.cxx |3 +--
sc/source/ui/view/output2.cxx |8 ++--
sc/source/ui/view/spelleng.cxx|3 +--
sc/source/ui/view/tabvwsha.cxx|2 +-
sc/source/ui/view/viewfun4.cxx|6 +++---
14 files changed, 22 insertions(+), 35 deletions(-)
New commits:
commit ab3be69580024da53653e06b34f515bef6ef690e
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jan 8 09:51:47 2013 -0500
Let's not have two variants of this getter. One is enough.
And let's stick with the one that returns the data pointer.
Change-Id: I931be0d73adcf6f3888d05ef58bc0f905f5a6958
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 30ee12b..ee040a2 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -242,10 +242,9 @@ public:
voidSetData( const EditTextObject* pObject,
const SfxItemPool* pFromPool /* = NULL */ );
-voidGetData( const EditTextObject* rpObject ) const;
rtl::OUString GetString() const;
-const EditTextObject* GetData() const { return pData; }
+const EditTextObject* GetData() const;
/** Removes character attribute based on new pattern attributes. */
voidRemoveCharAttribs( const ScPatternAttr rAttr );
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index bcf5283..c43f0c1 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -104,11 +104,6 @@ void ScEditCell::SetData( const EditTextObject* pObject,
SetTextObject( pObject, pFromPool );
}
-void ScEditCell::GetData( const EditTextObject* rpObject ) const
-{
-rpObject = pData;
-}
-
rtl::OUString ScEditCell::GetString() const
{
if ( pString )
@@ -129,6 +124,11 @@ rtl::OUString ScEditCell::GetString() const
return rtl::OUString();
}
+const EditTextObject* ScEditCell::GetData() const
+{
+return pData;
+}
+
void ScEditCell::RemoveCharAttribs( const ScPatternAttr rAttr )
{
const struct {
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 42f6cd0..5f30ebd 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -389,8 +389,7 @@ long ScColumn::GetNeededSize(
if ( pCell-GetCellType() == CELLTYPE_EDIT )
{
-const EditTextObject* pData;
-((ScEditCell*)pCell)-GetData(pData);
+const EditTextObject* pData =
static_castScEditCell*(pCell)-GetData();
pEngine-SetTextNewDefaults(*pData, pSet);
}
else
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index f49ba9f..b3b183f 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -43,8 +43,7 @@ bool lcl_GetTextWithBreaks( const ScEditCell rCell,
ScDocument* pDoc, rtl::OUSt
{
// true = more than 1 paragraph
-const EditTextObject* pData = NULL;
-rCell.GetData( pData );
+const EditTextObject* pData = rCell.GetData();
EditEngine rEngine = pDoc-GetEditEngine();
rEngine.SetText( *pData );
rVal = rEngine.GetText( LINEEND_LF );
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index 5045dd7..de2888e 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1206,9 +1206,8 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow,
SCTAB nTab )
sal_Bool ScHTMLExport::WriteFieldText( const ScEditCell* pCell )
{
-sal_Bool bFields = false;
-const EditTextObject* pData;
-pCell-GetData( pData );
+bool bFields = false;
+const EditTextObject* pData = pCell-GetData();
// text and anchor of URL fields, Doc-Engine is a ScFieldEditEngine
EditEngine rEngine = pDoc-GetEditEngine();
rEngine.SetText( *pData );
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index 2af2395..14c9b21 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -188,8 +188,7 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL
nCol )
{
bValueData = false;
EditEngine rEngine = GetEditEngine();
-const EditTextObject* pObj;
-((const ScEditCell*)pCell)-GetData( pObj );
+const EditTextObject* pObj = static_castconst
ScEditCell*(pCell)-GetData();
if ( pObj )
{
rEngine.SetText( *pObj );
diff --git a/sc/source/filter/xml/xmlcelli.cxx
Re: [Libreoffice-ux-advise] LATE FEATURE: Personas in LibreOffice
Hi Kendy, all Adolfo Jayme Barrientos wrote On Mon, Jan 7, 2013 at 4:32 AM, Jan Holesovsky lt; kendy@ gt; wrote: Please let me know if this is acceptable, and if you need any help with the review. It would be really nice to get this landed in 4.0. Many users ask for greater UI customization, and this is a great start. Putting technical issues aside, I don’t see UX problems in this. This is a quite nice feature although from my brief tests is only usable with Solid themes (artistic designs make buttons unreadable...) I tested under Windows XP with Version 4.1.0.0.alpha0+ (Build ID: ff927ba4272aa8f115472577ec9393df19016f2) TinderBox: Win-x86@6, Branch:master, Time: 2013-01-08_01:14:22 Background images (there is a typo in the Select Background Image button) are not loaded, neither jpg nor png Cheers, Pedro -- View this message in context: http://nabble.documentfoundation.org/LATE-FEATURE-Personas-in-LibreOffice-tp4027571p4027791.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sfx2/source
sfx2/source/control/thumbnailview.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 59555e5b38d62b92397d7f3eac5097211ed261c4
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Jan 8 16:05:48 2013 +0100
Template Manager: unselect folder when double-clicking
Change-Id: I11ad88b3a69d3e2a00e859ee33cbc22c5d525618
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index b9b0e89..618d7f2 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -513,7 +513,7 @@ void ThumbnailView::MouseButtonDown( const MouseEvent
rMEvt )
else if ( rMEvt.GetClicks() == 2 )
{
// The mouse button down event 1 click right before is
pointless
-pItem-setSelection(!pItem-isSelected());
+pItem-setSelection(false);
maItemStateHdl.Call(pItem);
Rectangle aRect(pItem-getDrawArea());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: why are we catching std::bad_alloc ?
On 01/04/2013 08:53 AM, Noel Grandin wrote: Why are we catching std::bad_alloc all over the place? git grep 'catch.*bad_alloc' | wc -l 68 Surely we should just let it crash? Or have a single handler for the whole process that at least attempts to provide some debugging data? At the moment, most of them just log something and then continues, which strikes me as counter-productive. Some of the catch blocks might be (somewhat hopeless) attempts at making functions (typically those implementing UNO interface methods) adhere to their dynamic exception specifications. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: editeng/inc editeng/source svx/source
editeng/inc/editeng/editobj.hxx |5 +--
editeng/source/editeng/editobj.cxx| 36 +++---
editeng/source/editeng/editobj2.hxx |3 -
svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | 12 +++
svx/source/svdraw/svdotext.cxx|8 ++--
5 files changed, 20 insertions(+), 44 deletions(-)
New commits:
commit 7ec3861d69a8c18488706564b27dbc344e3b5cd1
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jan 8 10:14:52 2013 -0500
Remove one variant of HasField() which takes arcane TypeId.
Change-Id: Ic8236b291ed5f318f67378bbc57b7cf027cbb92a
diff --git a/editeng/inc/editeng/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index 8e97b63..12c089c 100644
--- a/editeng/inc/editeng/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -28,6 +28,8 @@
#include editeng/editdata.hxx
#include editeng/editengdllapi.h
+#include com/sun/star/text/textfield/Type.hpp
+
#include vector
DBG_NAMEEX( EE_EditTextObject )
@@ -101,8 +103,7 @@ public:
virtual sal_BoolIsFieldObject() const;
virtual const SvxFieldItem* GetField() const;
-virtual sal_BoolHasField( TypeId aType = NULL ) const;
-virtual bool HasField( sal_Int32 nType ) const = 0;
+virtual bool HasField( sal_Int32 nType =
com::sun::star::text::textfield::Type::UNSPECIFIED ) const = 0;
virtual SfxItemSet GetParaAttribs(size_t nPara) const;
virtual void SetParaAttribs(size_t nPara, const SfxItemSet rAttribs);
diff --git a/editeng/source/editeng/editobj.cxx
b/editeng/source/editeng/editobj.cxx
index 56effb9..cd1bc10 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -44,6 +44,8 @@
#include unotools/fontcvt.hxx
#include tools/tenccvt.hxx
+using namespace com::sun::star;
+
DBG_NAME( EE_EditTextObject )
DBG_NAME( XEditAttribute )
@@ -267,12 +269,6 @@ const SvxFieldItem* EditTextObject::GetField() const
return 0;
}
-sal_Bool EditTextObject::HasField( TypeId /*aType*/ ) const
-{
-OSL_FAIL( Virtual method direct from EditTextObject! );
-return false;
-}
-
SfxItemSet EditTextObject::GetParaAttribs(size_t /*nPara*/) const
{
OSL_FAIL( Virtual method direct from EditTextObject! );
@@ -854,30 +850,6 @@ const SvxFieldItem* BinTextObject::GetField() const
return 0;
}
-sal_Bool BinTextObject::HasField( TypeId aType ) const
-{
-size_t nParagraphs = aContents.size();
-for (size_t nPara = 0; nPara nParagraphs; ++nPara)
-{
-const ContentInfo rC = aContents[nPara];
-size_t nAttrs = rC.aAttribs.size();
-for (size_t nAttr = 0; nAttr nAttrs; ++nAttr)
-{
-const XEditAttribute rAttr = rC.aAttribs[nAttr];
-if (rAttr.GetItem()-Which() == EE_FEATURE_FIELD)
-{
-if ( !aType )
-return true;
-
-const SvxFieldData* pFldData = static_castconst
SvxFieldItem*(rAttr.GetItem())-GetField();
-if ( pFldData pFldData-IsA( aType ) )
-return true;
-}
-}
-}
-return false;
-}
-
bool BinTextObject::HasField( sal_Int32 nType ) const
{
size_t nParagraphs = aContents.size();
@@ -891,6 +863,10 @@ bool BinTextObject::HasField( sal_Int32 nType ) const
if (rAttr.GetItem()-Which() != EE_FEATURE_FIELD)
continue;
+if (nType == text::textfield::Type::UNSPECIFIED)
+// Match any field type.
+return true;
+
const SvxFieldData* pFldData = static_castconst
SvxFieldItem*(rAttr.GetItem())-GetField();
if (pFldData pFldData-GetClassId() == nType)
return true;
diff --git a/editeng/source/editeng/editobj2.hxx
b/editeng/source/editeng/editobj2.hxx
index 52821c0..ef35579 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -232,8 +232,7 @@ public:
virtual sal_BoolIsFieldObject() const;
virtual const SvxFieldItem* GetField() const;
-virtual sal_BoolHasField( TypeId Type = NULL ) const;
-virtual bool HasField( sal_Int32 nType ) const;
+virtual bool HasField( sal_Int32 nType =
com::sun::star::text::textfield::Type::UNSPECIFIED ) const;
virtual SfxItemSet GetParaAttribs(size_t nPara) const;
virtual void SetParaAttribs(size_t nPara, const SfxItemSet rAttribs);
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index b5aaeac..cc003de 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -117,12 +117,12 @@ namespace drawinglayer
{
const EditTextObject rETO = maOutlinerParaObject.GetTextObject();
-mbContainsPageField = rETO.HasField(SvxPageField::StaticType());
-mbContainsPageCountField =
Re: [PUSHED 4.0] LATE FEATURE: Personas in LibreOffice
Michael Meeks píše v Út 08. 01. 2013 v 14:21 +: Hi there, I had a quick read; it -looks- rather low-touch - and the graphic effect is really pleasant; so I'd be well up for merging this. ( git --no-pager log --numstat -u 255c03d6ad4ed13c456ee621e0af765684a475d2~..4a4627eba410df933d004170d9f5638526acaed2 ; git --no-pager log --numstat -u 540f090a68ae4375a36d0ee6dfbb4a82f28ac704~..540f090a68ae4375a36d0ee6dfbb4a82f28ac704 ; git --no-pager log --numstat -u c223e5ff859171adab1597025b30ec2501fc5771~..3f3d0c52ae29b6ab6b2c10a5557714361aa76a26 ) | less IIRC we had this feature already for 4.0 for Windows, and this extends it to Linux+Mac. Having seen some oddness around transparency for Mac in the past, it would be worth testing there. But +1 from me for the -4-0 branch - assuming we can get another couple of reviews. As a quibble, I'd prefer to see BitmapEx's instead of BitmapEx*'s being used in the settings - which would simplify the code and make it less error prone I suspect; BitmapEx::IsEmpty is your friend :-) I took the approval from Cor, Olivier, Adolfo, Michael, and pushed into 4-0 branch for 4.0.0.1 build. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sfx2/source
sfx2/source/control/thumbnailview.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 49d7492e1dd89c52b798e5ac8ab01d4a0f771a35 Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Tue Jan 8 16:18:24 2013 +0100 Template Manager: clicking on empty space deselect everything Change-Id: I7cfbbd3a4f4283b9438a97eb383b460cad1f5a63 diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 618d7f2..61cb3f2 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -525,6 +525,8 @@ void ThumbnailView::MouseButtonDown( const MouseEvent rMEvt ) return; } +else if (!pItem) +deselectItems( ); } Control::MouseButtonDown( rMEvt ); ___ 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/control/thumbnailview.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 316463e4a9365cbe276bf6bc7f628dc2fab4fe45 Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Tue Jan 8 16:18:24 2013 +0100 Template Manager: clicking on empty space deselect everything Change-Id: I7cfbbd3a4f4283b9438a97eb383b460cad1f5a63 diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index d8ec2d2..2ec5e74 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -525,6 +525,8 @@ void ThumbnailView::MouseButtonDown( const MouseEvent rMEvt ) return; } +else if (!pItem) +deselectItems( ); } Control::MouseButtonDown( rMEvt ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dictionaries helpcontent2 solenv/bin translations
dictionaries |2 +-
helpcontent2 |2 +-
solenv/bin/modules/installer/windows/property.pm |2 +-
translations |2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 9dc3ee9a68749bb30536dbe767384d59827dee3d
Author: Andras Timar ati...@suse.com
Date: Tue Jan 8 16:38:13 2013 +0100
require .NET 4.0
Change-Id: Ida269499d91b4bdc16fe0ed91f202ddeefa4aadd
diff --git a/dictionaries b/dictionaries
index d047a0f..7e895dc 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit d047a0fa0746ce527720d15a36907e52dc67bf47
+Subproject commit 7e895dc439c87d229b7396076fdd8945b3b51f3f
diff --git a/helpcontent2 b/helpcontent2
index d5d84f0..d9d28eb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d5d84f0ec4584e32147eeab355d0ab73e7dd9172
+Subproject commit d9d28ebb575e96e742d6590a28dd59c62b89dc4e
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 52f3e34..56f4ba5d 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -399,7 +399,7 @@ sub set_important_properties
}
# Setting .NET requirements
-push @{$propertyfile}, REQUIRED_DOTNET_VERSION . \t . 2.0.0.0 . \n;
+push @{$propertyfile}, REQUIRED_DOTNET_VERSION . \t . 4.0.0.0 . \n;
push @{$propertyfile}, DOTNET_SUFFICIENT . \t . 1 . \n; # default
value for found .NET
}
diff --git a/translations b/translations
index e5f69f7..85f724f 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit e5f69f7b241f21f0b85f7a62ccff9de841875828
+Subproject commit 85f724f5aa1d6a59662a7d1c7ea406a641814bd2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: embedserv/source
embedserv/source/inprocserv/inprocembobj.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a6f978e1c3a27c7045ec3be129d8d6883f021015 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jan 8 16:42:07 2013 +0100 Logic (only update ret if it does not indicate an error yet) Change-Id: I717ff4de7cf406b01383f8f181b81695242a2ca8 diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx index 27c28ad..536095f 100644 --- a/embedserv/source/inprocserv/inprocembobj.cxx +++ b/embedserv/source/inprocserv/inprocembobj.cxx @@ -785,7 +785,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Close( DWORD dwSaveOption ) if (!SUCCEEDED(hr)) ret = hr; hr = CoDisconnectObject( (IUnknown*)(IPersistStorage*)this, 0 ); -if (!(SUCCEEDED(hr) SUCCEEDED(ret))) +if (!SUCCEEDED(hr) SUCCEEDED(ret)) ret = hr; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/source
sfx2/source/control/thumbnailview.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f10a3305473c83893a2c3062ce9fb8c9146fd1dc
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Jan 8 16:45:20 2013 +0100
Template Manager: clicking on selected item should deselect it
Change-Id: Id13ce13ec222fc10cbfcad7fec5e7eeb5957312c
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 61cb3f2..0e47fb7 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -503,7 +503,7 @@ void ThumbnailView::MouseButtonDown( const MouseEvent
rMEvt )
{
if (!pItem-isSelected() !rMEvt.IsMod1())
deselectItems( );
-pItem-setSelection(!pItem-isSelected());
+pItem-setSelection(true);
if (!pItem-isHighlighted())
DrawItem(pItem);
___
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/control/thumbnailview.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 44f49ff0db0e22c21f020f9fbd7c95526bc0b55f
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Jan 8 16:45:20 2013 +0100
Template Manager: clicking on selected item should deselect it
Change-Id: Id13ce13ec222fc10cbfcad7fec5e7eeb5957312c
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 2ec5e74..c3957f0 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -503,7 +503,7 @@ void ThumbnailView::MouseButtonDown( const MouseEvent
rMEvt )
{
if (!pItem-isSelected() !rMEvt.IsMod1())
deselectItems( );
-pItem-setSelection(!pItem-isSelected());
+pItem-setSelection(true);
if (!pItem-isHighlighted())
DrawItem(pItem);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Change public variables of class ImplDevFontAttributes to pr...
navin patidar has abandoned this change. Change subject: Change public variables of class ImplDevFontAttributes to private. .. Patch Set 2: Abandoned -- To view, visit https://gerrit.libreoffice.org/1565 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I256a1ca329f715270ba31261b16858341c91fc26 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: navin patidar pati...@kacst.edu.sa Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - dictionaries helpcontent2 translations
dictionaries |2 +-
helpcontent2 |2 +-
translations |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit abcff79a15e39add5f89512984980ee0f3821b68
Author: Andras Timar ati...@suse.com
Date: Tue Jan 8 17:06:46 2013 +0100
require .NET 4.0
Change-Id: Ia6e3acf563a9c04bf9a2ff5f3f755eb4e92e771c
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 52f3e34..56f4ba5d 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -399,7 +399,7 @@ sub set_important_properties
}
# Setting .NET requirements
-push @{$propertyfile}, REQUIRED_DOTNET_VERSION . \t . 2.0.0.0 . \n;
+push @{$propertyfile}, REQUIRED_DOTNET_VERSION . \t . 4.0.0.0 . \n;
push @{$propertyfile}, DOTNET_SUFFICIENT . \t . 1 . \n; # default
value for found .NET
}
commit 23be19789c80b4236a21ccf090342ae47c832dc9
Author: Andras Timar ati...@suse.com
Date: Tue Jan 8 16:48:45 2013 +0100
Revert require .NET 4.0
This reverts commit 9dc3ee9a68749bb30536dbe767384d59827dee3d.
diff --git a/dictionaries b/dictionaries
index 7e895dc..d047a0f 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 7e895dc439c87d229b7396076fdd8945b3b51f3f
+Subproject commit d047a0fa0746ce527720d15a36907e52dc67bf47
diff --git a/helpcontent2 b/helpcontent2
index d9d28eb..d5d84f0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d9d28ebb575e96e742d6590a28dd59c62b89dc4e
+Subproject commit d5d84f0ec4584e32147eeab355d0ab73e7dd9172
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 56f4ba5d..52f3e34 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -399,7 +399,7 @@ sub set_important_properties
}
# Setting .NET requirements
-push @{$propertyfile}, REQUIRED_DOTNET_VERSION . \t . 4.0.0.0 . \n;
+push @{$propertyfile}, REQUIRED_DOTNET_VERSION . \t . 2.0.0.0 . \n;
push @{$propertyfile}, DOTNET_SUFFICIENT . \t . 1 . \n; # default
value for found .NET
}
diff --git a/translations b/translations
index 85f724f..e5f69f7 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 85f724f5aa1d6a59662a7d1c7ea406a641814bd2
+Subproject commit e5f69f7b241f21f0b85f7a62ccff9de841875828
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Yi Ding yi.s.d...@gmail.com changed: What|Removed |Added Depends on||58531 --- Comment #73 from Yi Ding yi.s.d...@gmail.com --- I nominate bug 58531: links in spreadsheets broken by default (they don't update even if the user clicks yes to update them) -- 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
[PUSHED] Change in core[libreoffice-4-0]: fdo#58671: Remove accelerators from Undo action texts
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1596 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1596 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icec8e199c7cc3990b6316937e49aacb7eb1015fb Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Korrawit Pruegsanusak detective.conan.1...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Korrawit Pruegsanusak detective.conan.1...@gmail.com Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - solenv/bin
solenv/bin/modules/installer/windows/property.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 43c704aa24c48cd8b20049901d3d0bad20dd801a
Author: Andras Timar ati...@suse.com
Date: Tue Jan 8 17:06:46 2013 +0100
require .NET 4.0
Change-Id: Ia6e3acf563a9c04bf9a2ff5f3f755eb4e92e771c
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 52f3e34..56f4ba5d 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -399,7 +399,7 @@ sub set_important_properties
}
# Setting .NET requirements
-push @{$propertyfile}, REQUIRED_DOTNET_VERSION . \t . 2.0.0.0 . \n;
+push @{$propertyfile}, REQUIRED_DOTNET_VERSION . \t . 4.0.0.0 . \n;
push @{$propertyfile}, DOTNET_SUFFICIENT . \t . 1 . \n; # default
value for found .NET
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - cui/source cui/uiconfig
cui/source/options/personalization.cxx |9 + cui/uiconfig/ui/personalization_tab.ui |2 +- 2 files changed, 10 insertions(+), 1 deletion(-) New commits: commit d8e1fed0f6f83d03a5075cfe3c0c6b10a7d4e167 Author: Jan Holesovsky ke...@suse.cz Date: Tue Jan 8 17:10:15 2013 +0100 Personas: Hide Background image from the Personalization settings. The Bacground image thing is 4.1 work. Change-Id: I40d67b83d7dd8490c4a8fbe4033efdd611358831 diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 14e071f..10ee48b 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -105,6 +105,15 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( Window *pParent, const Sfx get( m_pSelectBackground, select_background ); m_pSelectBackground-SetClickHdl( LINK( this, SvxPersonalizationTabPage, SelectBackground ) ); +// HACK for 4.0 - Background image not implemented +Window *pWindow; +get( pWindow, background_label ); +pWindow-Hide(); +m_pNoBackground-Hide(); +m_pDefaultBackground-Hide(); +m_pOwnBackground-Hide(); +m_pSelectBackground-Hide(); + // persona get( m_pNoPersona, no_persona ); get( m_pDefaultPersona, default_persona ); diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui index 12acf49..1e5f0b5 100644 --- a/cui/uiconfig/ui/personalization_tab.ui +++ b/cui/uiconfig/ui/personalization_tab.ui @@ -102,7 +102,7 @@ /object /child child type=label - object class=GtkLabel id=label2 + object class=GtkLabel id=background_label property name=visibleTrue/property property name=can_focusFalse/property property name=label translatable=yesBackground Image/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW] domain-mapper import speedup patch ...
On Tue, 2013-01-08 at 14:15 +0100, Michael Stahl wrote:
there may be more places where a similar approach could be applicable,
both in API implementations in sw and in writerfilter/xmloff import
code, e.g. see cc99bb9f383a65912d004e227a5b6a88b401bbba which was purely
result of me debugging some crash and wondering why a certain insert
method in sw core is called so often (in that case sw API impl. actually
did the right thing).
:-) as I say, it seems to me that being able to manipulate SfxItemSet's
from UNO (or better not using UNO at all to talk to the core from the
DomainMapper ;-), might allow the same item-set to be re-used
It has a FIXME - I'm unclear
exactly what's going on there. Clearly I'm wandering at the edge of my
competence wrt. the writer bits here, so help/encouragement appreciated.
...
i suppose this exception would be thrown by
SwUnoCursorHelper::SetPropertyValues now anyway... which is actually a
problem because in that case
m_pImpl-m_pDoc-GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, NULL);
won't be executed and we get a confused UNDO stack in writer...
Ah right - we need the try/catch goodness there still. I've added that
back.
i guess it's best to move the Start/EndUndo into
SwUnoCursorHelper::SetPropertyValues to fix that (can't be omitted
entirely since it's possible that multiple different Undo objects are
created).
I've re-worked it as attached; I'd love to use the same code for
setting paragraph properties (which I suspect would give us another real
win there). Having said that switching the #if 1 to turn that on breaks
'make slowcheck' - though quite why is not immediately apparent to me
from code-reading ;-)
Any help getting that finished off / merged v. much appreciated.
Thanks !
Michael.
--
michael.me...@suse.com , Pseudo Engineer, itinerant idiot
From e16eee537677587537b3884276a528e63a5a4c07 Mon Sep 17 00:00:00 2001
From: Michael Meeks michael.me...@suse.com
Date: Fri, 21 Dec 2012 15:27:27 +
Subject: [PATCH] fdo#44736 - set and fetch multiple properties concurrently
The domain-mapper calls SwXText::insertTextPortion very extensively
accounting for about half of import time for large, lightly formatted
text documents. The vast majority of the work is consumed managing
char + para properties - so try to batch that, making it 70% faster
for my lightly formatted test. Saves around 25% of load time for me.
Change-Id: I2582adee1bf35b07b90af810cb0d19dadc1d348f
---
sw/inc/unocrsrhelper.hxx | 13 +
sw/source/core/unocore/unoobj.cxx | 87 +++
sw/source/core/unocore/unotext.cxx | 74 ---
3 files changed, 118 insertions(+), 56 deletions(-)
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index a5892f6..aa7fd4d 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -151,6 +151,19 @@ namespace SwUnoCursorHelper
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+/// @param bTableMode: attributes should be applied to a table selection
+void SetPropertyValues(
+SwPaM rPaM,
+const SfxItemPropertySet rPropSet,
+const ::com::sun::star::uno::Sequence ::com::sun::star::beans::PropertyValue
+rPropertyValues,
+const SetAttrMode nAttrMode = nsSetAttrMode::SETATTR_DEFAULT,
+const bool bTableMode = false)
+throw (::com::sun::star::beans::UnknownPropertyException,
+::com::sun::star::beans::PropertyVetoException,
+::com::sun::star::lang::IllegalArgumentException,
+::com::sun::star::lang::WrappedTargetException,
+::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Any GetPropertyValue(
SwPaM rPaM,
const SfxItemPropertySet rPropSet,
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 01318bb..f5736b8 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -1861,34 +1861,81 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
{
+uno::Sequence beans::PropertyValue aValues(1);
+aValues[0].Name = rPropertyName;
+aValues[0].Value = rValue;
+SetPropertyValues(rPaM, rPropSet, aValues, nAttrMode, bTableMode);
+}
+
+void SwUnoCursorHelper::SetPropertyValues(
+SwPaM rPaM, const SfxItemPropertySet rPropSet,
+const uno::Sequence beans::PropertyValue rPropertyValues,
+const SetAttrMode nAttrMode, const bool bTableMode)
+throw (beans::UnknownPropertyException, beans::PropertyVetoException,
+lang::IllegalArgumentException,
[Libreoffice-commits] .: 2 commits - src/docrecord.py src/docstream.py test/doc
src/docrecord.py | 17 +
src/docstream.py |7 ++-
test/doc/test.py |4
3 files changed, 27 insertions(+), 1 deletion(-)
New commits:
commit 7d1c795d84df8c1ef443222b62118bb6c958ae3a
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jan 8 17:10:14 2013 +0100
dump GrpXstAtnOwners
diff --git a/src/docrecord.py b/src/docrecord.py
index e5f29fe..5638a5e 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -1596,6 +1596,23 @@ class SttbfFfn(DOCDirStream):
print '/cchData'
print '/sttbfFfn'
+class GrpXstAtnOwners(DOCDirStream):
+This array contains the names of authors of comments in the document.
+def __init__(self, mainStream):
+DOCDirStream.__init__(self,
mainStream.doc.getDirectoryStreamByName(1Table).bytes)
+self.pos = mainStream.fcGrpXstAtnOwners
+self.size = mainStream.lcbGrpXstAtnOwners
+self.mainStream = mainStream
+
+def dump(self):
+posOrig = self.pos
+print 'grpXstAtnOwners type=GrpXstAtnOwners offset=%d size=%d
bytes' % (self.pos, self.size)
+while self.pos posOrig + self.size:
+xst = Xst(self)
+xst.dump()
+self.pos = xst.pos
+print '/grpXstAtnOwners'
+
class SttbfAssoc(DOCDirStream):
The SttbfAssoc structure is an STTB that contains strings which are
associated with this document.
def __init__(self, mainStream):
diff --git a/src/docstream.py b/src/docstream.py
index f07116a..167fb9c 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -276,7 +276,7 @@ class WordDocumentStream(DOCDirStream):
[fcAutosaveSource],
[lcbAutosaveSource],
[fcGrpXstAtnOwners],
-[lcbGrpXstAtnOwners],
+[lcbGrpXstAtnOwners, self.handleLcbGrpXstAtnOwners],
[fcSttbfAtnBkmk],
[lcbSttbfAtnBkmk, self.handleLcbSttbfAtnBkmk],
[fcUnused2],
@@ -464,6 +464,9 @@ class WordDocumentStream(DOCDirStream):
plcfandRef = docrecord.PlcfandRef(self, offset, size)
plcfandRef.dump()
+def handleLcbGrpXstAtnOwners(self):
+docrecord.GrpXstAtnOwners(self).dump()
+
def handleLcbSttbfAtnBkmk(self):
offset = self.fcSttbfAtnBkmk
size = self.lcbSttbfAtnBkmk
diff --git a/test/doc/test.py b/test/doc/test.py
index 5fe743c..a97d0f5 100755
--- a/test/doc/test.py
+++ b/test/doc/test.py
@@ -114,6 +114,10 @@ class Test(unittest.TestCase):
self.assertEqual('Hello',
commentEnds[0].findall('transformed')[0].attrib['value'])
self.assertEqual('This',
commentEnds[1].findall('transformed')[0].attrib['value'])
+authors =
self.root.findall('stream[@name=WordDocument]/fib/fibRgFcLcbBlob/lcbGrpXstAtnOwners/grpXstAtnOwners/xst/rgtchar')
+self.assertEqual(1, len(authors))
+self.assertEqual('vmiklos', authors[0].attrib['value'])
+
def test_zoom(self):
self.dump('zoom')
dopBase =
self.root.findall('stream[@name=WordDocument]/fib/fibRgFcLcbBlob/lcbDop/dop/dop2007/dop2003/dop2002/dop2000/dop97/dop95/dopBase')[0]
commit c8c0c1a2c1f1bb0468a934830ca1ae9f36f3b8ab
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jan 8 16:59:05 2013 +0100
read FibRgLw97.ccpHdd
diff --git a/src/docstream.py b/src/docstream.py
index a29b9c6..f07116a 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -407,6 +407,8 @@ class WordDocumentStream(DOCDirStream):
hasHandler = len(i) 1
# the spec says these must be ignored
needsIgnoring = [lcbStshfOrig]
+if self.ccpHdd == 0:
+needsIgnoring.append(lcbPlcfHdd)
# a member needs handling if it defines the size of a struct and
it's non-zero
needsHandling = i[0].startswith(lcb) and value != 0 and (not
i[0] in needsIgnoring)
self.printAndSet(i[0], value, end = ((not hasHandler) and (not
needsHandling)), offset = True)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source
desktop/source/migration/migration.cxx | 59 ++--
desktop/source/migration/migration_impl.hxx |1
2 files changed, 23 insertions(+), 37 deletions(-)
New commits:
commit 57eff6cf9db5d765482a2c41698915c37927ae57
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 8 17:23:58 2013 +0100
Fix MigrationImpl::subtract
The original code is broken to begin with, as it ignores the return values
from
the std::unique calls, so excess elements remain at the end of va and vb.
(http://lists.freedesktop.org/archives/libreoffice/2013-January/043552.html
[PATCH] Simplify MigrationImpl::subtract in desktop; see that mail thread
also
for the inspiration to use std::set_difference.)
This fix is not very relevant though, as there are no ExcludedFiles lists
in
officecfg/registry/data/org/openoffice/Setup.xcu, so the second argument is
always empty, so the return value is always a (sorted) copy of the first
argument, and the IncludedFiles lists in Setup.xcu produce no duplicates,
so
std::unique does not shrink the first argument anyway.
Change-Id: Ie9fb64ee40fef6e7bdf0f5d0eca5717fec7b0d50
diff --git a/desktop/source/migration/migration.cxx
b/desktop/source/migration/migration.cxx
index d4edf4f..82f573f 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -17,7 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include sal/config.h
+#include algorithm
#include map
#include new
#include set
@@ -700,6 +702,25 @@ strings_vr MigrationImpl::getAllFiles(const OUString
baseURL) const
return vrResult;
}
+namespace {
+
+// removes elements of vector 2 in vector 1
+strings_v subtract(strings_v const va, strings_v const vb) {
+strings_v a(va);
+std::sort(a.begin(), a.end());
+strings_v::iterator ae(std::unique(a.begin(), a.end()));
+strings_v b(vb);
+std::sort(b.begin(), b.end());
+strings_v::iterator be(std::unique(b.begin(), b.end()));
+strings_v c(ae - a.begin());
+strings_v::iterator ce(
+std::set_difference(a.begin(), ae, b.begin(), be, c.begin()));
+c.resize(ce - c.begin());
+return c;
+}
+
+}
+
strings_vr MigrationImpl::compileFileList()
{
@@ -716,8 +737,8 @@ strings_vr MigrationImpl::compileFileList()
{
vrInclude = applyPatterns(*vrFiles, i_migr-includeFiles);
vrExclude = applyPatterns(*vrFiles, i_migr-excludeFiles);
-subtract(*vrInclude, *vrExclude);
-vrResult-insert(vrResult-end(), vrInclude-begin(),
vrInclude-end());
+strings_v sub(subtract(*vrInclude, *vrExclude));
+vrResult-insert(vrResult-end(), sub.begin(), sub.end());
++i_migr;
}
return vrResult;
@@ -842,40 +863,6 @@ void MigrationImpl::copyConfig() {
}
}
-// removes elements of vector 2 in vector 1
-void MigrationImpl::subtract(strings_v va, const strings_v vb_c) const
-{
-strings_v vb(vb_c);
-// ensure uniqueness of entries
-sort(va.begin(), va.end());
-sort(vb.begin(), vb.end());
-unique(va.begin(), va.end());
-unique(vb.begin(), vb.end());
-
-strings_v::const_iterator i_ex = vb.begin();
-strings_v::iterator i_in;
-strings_v::iterator i_next;
-while (i_ex != vb.end())
-{
-i_in = va.begin();
-while (i_in != va.end())
-{
-if ( *i_in == *i_ex)
-{
-i_next = i_in+1;
-va.erase(i_in);
-i_in = i_next;
-// we can only find one match since we
-// ensured uniquness of the entries. ergo:
-break;
-}
-else
-++i_in;
-}
-++i_ex;
-}
-}
-
uno::Reference XNameAccess MigrationImpl::getConfigAccess(const sal_Char*
pPath, sal_Bool bUpdate)
{
uno::Reference XNameAccess xNameAccess;
diff --git a/desktop/source/migration/migration_impl.hxx
b/desktop/source/migration/migration_impl.hxx
index 5458f8c..ef2e659 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -208,7 +208,6 @@ private:
strings_vrcompileFileList();
// helpers
-void subtract(strings_v va, const strings_v vb_c) const;
strings_vr getAllFiles(const rtl::OUString baseURL) const;
strings_vr applyPatterns(const strings_v vSet, const strings_v
vPatterns) const;
NS_UNO::Reference NS_CSS::container::XNameAccess getConfigAccess(const
sal_Char* path, sal_Bool rw=sal_False);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [RESOLVED/INVALID] Re: [PATCH] Simplify MigrationImpl::subtract in desktop
On 01/08/2013 02:51 PM, julien2412 wrote: The +5 is obviously a kind of type (certainly due to my wrong use of Vi :-)) Above the rest, I didn't think there would be these kinds of problem and must recognize I don't what to answer. So, let's bin all this. Thank you for having taken a look. So I pushed a fix anyway, http://cgit.freedesktop.org/libreoffice/core/commit/?id=57eff6cf9db5d765482a2c41698915c37927ae57 Fix MigrationImpl::subtract. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-l10n] Translation of the names of the keys on Windows
Hi, is there an option to rename also the Alt, Ctrl, Tab and Esc keys in that file? Thanks, m. 2013/1/8 Jesús Corrius je...@softcatala.org: Hi all, Since today it's possible to provide custom translations of the names of the keys on Windows. This is useful because Windows gets the name of the key from the keyboard layout and, in some cases, they don't match properly. For example, Catalan users don't have a proper keyboard layout (well, they do have one but it's just an alias for the Spanish keyboard) so if a user uses the Spanish or French keyboard, the name of the keys in the UI will be in Spanish or French, but never in Catalan. I am sure other languages have this problem too. So it's now possible to provide custom names for keys for Windows using the same way we do for Linux. The file to modify is the following one and the process is exactly the same: http://cgit.freedesktop.org/libreoffice/core/tree/vcl/win/source/window/keynames.cxx If you want to implement this, but you are not a developer, just send me the name of the keys with its translation and I will apply the changes myself. Thanks and Happy 2013 to everybody! -- Jesús Corrius je...@softcatala.org -- Unsubscribe instructions: E-mail to l10n+h...@global.libreoffice.org Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://listarchives.libreoffice.org/global/l10n/ All messages sent to this list will be publicly archived and cannot be deleted ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Crash with gnome#627420-1.ods in string related function
On 01/08/2013 02:19 PM, julien2412 wrote:
Reading this thread, I took a look at sal/rtl/source/strtmpl.cxx
969 static IMPL_RTL_STRINGDATA* IMPL_RTL_STRINGNAME( ImplAlloc )(
sal_Int32 nLen )
970 {
971 IMPL_RTL_STRINGDATA * pData
972 = (sal::static_int_cast sal_uInt32 (nLen)
973= ((SAL_MAX_UINT32 - sizeof (IMPL_RTL_STRINGDATA))
974/ sizeof (IMPL_RTL_STRCODE)))
975 ? (IMPL_RTL_STRINGDATA *) rtl_allocateMemory(
976 sizeof (IMPL_RTL_STRINGDATA) + nLen * sizeof
(IMPL_RTL_STRCODE))
977 : NULL;
978 if (pData != NULL) {
979 pData-refCount = 1;
980 pData-length = nLen;
981 pData-buffer[nLen] = 0;
982 }
983 return pData;
984 }
Since we cast nLen parameter in sal_uInt32, could it help to add an
assert about nLen should be = 0 ?
Such an assert would surely not hurt, but I suspect that there are call
sites that do not catch overflow of computed length values (where such
overflow can lead to wrong values that are negative as well as
non-negative), so such an assert alone would not help catch all the
problematic call sites.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - editeng/source
editeng/source/rtf/rtfgrf.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca3f80193d52e058170aa91ec21b61343ac07fbe Author: Petr Mladek pmla...@suse.cz Date: Tue Jan 8 17:53:13 2013 +0100 One more location using the moved svtools/wmf.hxx The new location is vcl/wmf.hxx. Change-Id: I86f07507318b7ef705618ee90b7261d259928d0c diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx index 91c7f3c..6cdc5e6 100644 --- a/editeng/source/rtf/rtfgrf.cxx +++ b/editeng/source/rtf/rtfgrf.cxx @@ -25,9 +25,9 @@ #include vcl/graph.hxx #include vcl/svapp.hxx #include vcl/graphicfilter.hxx +#include vcl/wmf.hxx #include svtools/rtfkeywd.hxx #include svtools/rtftoken.h -#include svtools/wmf.hxx #include editeng/svxrtf.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - src/docrecord.py
src/docrecord.py | 45 +++-- 1 file changed, 43 insertions(+), 2 deletions(-) New commits: commit 0eff7797b92b60fc0d5a8926f95b2227e3e18fb2 Author: Miklos Vajna vmik...@suse.cz Date: Tue Jan 8 17:35:25 2013 +0100 PapxInFkp: handle non-zero cb diff --git a/src/docrecord.py b/src/docrecord.py index 13e3e40..0aa271d 100644 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -567,9 +567,9 @@ class PapxInFkp(DOCDirStream): if self.cb == 0: self.printAndSet(cb_, self.readuInt8()) grpPrlAndIstd = GrpPrlAndIstd(self.bytes, self.pos, 2 * self.cb_) -grpPrlAndIstd.dump() else: -print 'todo what=PapxInFkp::dump() first byte is not 0/' +grpPrlAndIstd = GrpPrlAndIstd(self.bytes, self.pos, self.cb) +grpPrlAndIstd.dump() print '/papxInFkp' class BxPap(DOCDirStream): commit 48ca425259dad99f2c2c8b0c7e2dc3f93adfa973 Author: Miklos Vajna vmik...@suse.cz Date: Tue Jan 8 17:29:24 2013 +0100 dump PChgTabsPapxOperand diff --git a/src/docrecord.py b/src/docrecord.py index 5638a5e..13e3e40 100644 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -371,6 +371,45 @@ class BRC(DOCDirStream): self.printAndSet(fReserved, self.fReserved) print '/brc' +class PChgTabsDel(DOCDirStream): +The PChgTabsDel structure specifies the locations at which custom tab stops are ignored. +def __init__(self, parent): +DOCDirStream.__init__(self, parent.bytes) +self.pos = parent.pos + +def dump(self): +print 'pchgTabsDel type=PChgTabsDel offset=%d' % self.pos +self.printAndSet(cTabs, self.readuInt8()) +if self.cTabs != 0: +print 'todo what=PChgTabsDel::dump() cTabs is non-zero/' +print '/pchgTabsDel' + +class PChgTabsAdd(DOCDirStream): +The PChgTabsAdd structure specifies the locations and properties of custom tab stops. +def __init__(self, parent): +DOCDirStream.__init__(self, parent.bytes) +self.pos = parent.pos + +def dump(self): +print 'pchgTabsAdd type=PChgTabsAdd offset=%d' % self.pos +self.printAndSet(cTabs, self.readuInt8()) +if self.cTabs != 0: +print 'todo what=PChgTabsAdd::dump() cTabs is non-zero/' +print '/pchgTabsAdd' + +class PChgTabsPapxOperand(DOCDirStream): +The PChgTabsPapxOperand structure is used by sprmPChgTabsPapx to specify custom tab stops to be added or ignored. +def __init__(self, parent): +DOCDirStream.__init__(self, parent.bytes) +self.pos = parent.pos + +def dump(self): +print 'pchgTabsPapxOperand type=PChgTabsPapxOperand offset=%d' % self.pos +self.printAndSet(cb, self.readuInt8()) +PChgTabsDel(self).dump() +PChgTabsAdd(self).dump() +print '/pchgTabsPapxOperand' + class BrcOperand(DOCDirStream): The BrcOperand structure is the operand to several SPRMs that control borders. def __init__(self, parent): @@ -422,6 +461,8 @@ class Sprm(DOCDirStream): elif self.getOperandSize() == 9: if self.sprm in (0xd234, 0xd235, 0xd236, 0xd237): self.ct = BrcOperand(self) +elif self.sprm == 0xc60d: +self.ct = PChgTabsPapxOperand(self) else: print 'todo what=Sprm::__init__() unhandled sprm of size 9/' ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 choffardet pierre.choffar...@free.fr changed: What|Removed |Added Depends on||58893 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #193 from choffardet pierre.choffar...@free.fr --- as silent give consent, I've raised this bug https://bugs.freedesktop.org/show_bug.cgi?id=58893 [crash] filopen master document with linked template modified it's a regression against 3.5.7 libreoffice Crash the only workaround is to let libreoffice crash and restart libo (one time on loop) -- 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
Fwd: [developerteam] Secure Web Browser Dooble - Version 1.38 released
fye - Forwarded message -- Date: 2013/1/8 Subject: [developerteam getadooble] Dooble Version 1.38 To: dooble-developm...@lists.sourceforge.net, dooble-t...@lists.sourceforge.net We are proud to announce a new Dooble release, the first of 2013. Enjoy! https://sourceforge.net/projects/dooble/files/Version%201.38/ http://dooble.sf.net http://en.wikipedia.org/wiki/Dooble ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: pt_BR/pt_BR.dic pt_BR/pythonpath
pt_BR/pt_BR.dic | 30 +++--- pt_BR/pythonpath/lightproof_pt_BR.py |2 +- 2 files changed, 28 insertions(+), 4 deletions(-) New commits: commit f310b731bbbaf968b513bea1dd460e5d96b0c61c Author: Olivier Hallot olivier.hal...@alta.org.br Date: Tue Jan 8 15:38:10 2013 -0200 Update pt-BR spell grammar checkers Change-Id: I26606dbbcaf90ac6caaaf56f0cdfa3b73364ce18 reference: VERO beta28 Reviewed-on: https://gerrit.libreoffice.org/1598 Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br Tested-by: Olivier Hallot olivier.hal...@alta.org.br diff --git a/pt_BR/pt_BR.dic b/pt_BR/pt_BR.dic index 63a3760..7fb1c1c 100644 --- a/pt_BR/pt_BR.dic +++ b/pt_BR/pt_BR.dic @@ -1,4 +1,4 @@ -311606 +311630 a ª á/Ý @@ -30616,6 +30616,7 @@ autoecol autoefetivado/D autoelevatório/D autoempreendedor/D +autoenrolamento/B autoentendimento/B autoentrada/B autoenvelopadora/B @@ -77277,6 +77278,7 @@ constritor/DR constritório/D construção/BQWÃÀÂÌ construçãozinha +construcionismo/B3 constructo/B construir/isjLÂÀ construível/BKXI @@ -88218,6 +88220,7 @@ dedos-duros dedução/BQW deducente/B deducional/BJXZ2HRV +deduplicação/B dedurar/akYMjL dedurismo/B dedutível/BKX1Ä @@ -95791,7 +95794,9 @@ diretor-geral/ Diretor-Geral diretor-gerente diretor-presidente +Diretor-presidente Diretor-Presidente +DIRETOR-PRESIDENTE diretor-produtor diretor-regional diretor-secretário @@ -95802,6 +95807,7 @@ diretora-criativa diretora-executiva diretora-geral diretora-presidente +Diretora-Presidente diretora-produtora diretorado/DÈ diretoras-assistentes @@ -103815,6 +103821,7 @@ empresa-cliente/ Empresa-Cliente/Ý empresa-escola Empresa-Escola +empresa-líder empresa-mãe empresar/akYMjL empresarial/BJXZ2HRVÁÖû @@ -103823,6 +103830,7 @@ empresariar/akYMjL empresário/Düû empresas-alvo empresas-clientes/Ý +empresas-líderes empresas-mãe/B empressada/B empressita/B @@ -117410,6 +117418,7 @@ estican esticão/BRV esticar/akYMjL esticário/D +esticável esticocarpo/B esticococo/B esticoglosso/D @@ -125603,6 +125612,7 @@ fermentoter fermi/B fermião/B férmio/B +férmion/B fermiônico/DK13 Fermo fermorita/B @@ -131828,6 +131838,7 @@ franchona/B franciano/D frâncico/D Francilda +Francinaldo Francine Francineide Francinópolis @@ -149614,7 +149625,7 @@ hez hezronitas Hf Hg -hia/B +hia/BÝ hiacintácea/B hiacintino/D hiacinto/B @@ -151754,6 +151765,7 @@ hiperpoder/B hiperpolarizadinho/D hiperpolarizadíssimo/D hiperpolarizante/BP +hiperpolêmico/D hiperpositivismo/B3 hiperprolactinemia/BK hiperprosexia/B @@ -160756,6 +160768,7 @@ intramento/B intraministeriais intramobilidade/B intramorfênico/D +intramunicipal/B intrancedente/BJ intrância/BÀ intrans./Ý @@ -182137,6 +182150,7 @@ magnetel magnetelétrico/D magnetencefalografia/BK magnético/DK13ÃÁãï +magnético-isolante/B magnetímetro/B magnetipolar/BR magnetístico/DK13 @@ -205033,6 +205047,7 @@ multifinalit multiflagelado/D multifloro/D multífluo/D +multifluxo/B multifocal/BJXZ2HRV multifoliado/DJ multifoliar/BR @@ -206258,7 +206273,7 @@ musculofibroso/DJXHZOP musculofrênico/D musculoligamentoso/DJXHZOP musculomembranoso/DJXHZOP -musculoso/DJXHZOP +musculoso/DJXHZOPÌÎà musculospinal/BJXZ2HRV musculospiral/BJXZ2HRV musculosqueletal/BJXZ2HRV @@ -207506,6 +207521,7 @@ nanocormo/D nanócrino/B nanocristal/B nanocristalino/D +nanocubo/B nanocurie/B nanodendro/B nanodêndron/B @@ -247499,6 +247515,7 @@ pr pré-designado/D pré-determinado/D pré-diabetes +pré-diagnóstico/D pré-diálise/B pré-digerido/D pré-eliminatório/D @@ -249324,6 +249341,7 @@ produto/BP produtor/DRÀÑ produtor-chefe produtor-executivo/Ñ +Produtor-Executivo produtora-chefe produtora-executiva/Ñ produtoras-chefes @@ -259763,6 +259781,7 @@ reconfortos recongraçação/BQW reconstitucionalizável/KXI reconstitutível/BKXI +reconstrucionismo/B3 reconstruinte/BP recontação/BQW reconversível/B @@ -260498,6 +260517,7 @@ rein reinol/CA reinos reintegratório/D +reinteresse/B reintrar/BR reinventor/D reinversão/BQW @@ -272796,6 +272816,7 @@ semiotismo/B semiotista/B semioto/B semioval/B +semióxido/B semipalavra/B semipalmado/D semiparalela/B @@ -279693,6 +279714,7 @@ subafl./ subafls./Ý subafretamento/B subafunilado/D +subagendamento/B subagregado/D subaiense/B subalado/DJ @@ -280650,6 +280672,7 @@ sul-alvoradense/B sul-americanismo/B3 sul-americano/D Sul-Americano/D +sul-andino/D sul-arábico/D sul-asiático/DK13 sul-bocaiuvense/B @@ -281310,6 +281333,7 @@ superarrefecido/D superarrependido/D superarrojado/D superassassino/D +superátomo/B superatrapalhado/D superatrasado/D superautomatização/BQW diff --git a/pt_BR/pythonpath/lightproof_pt_BR.py b/pt_BR/pythonpath/lightproof_pt_BR.py index 7b60d33..a4b8a7c 100644 --- a/pt_BR/pythonpath/lightproof_pt_BR.py +++ b/pt_BR/pythonpath/lightproof_pt_BR.py @@ -1 +1 @@ ... etc. - the rest is truncated
[Libreoffice-commits] .: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 28c7e8fb60596c20dedc87c22510a937d6fd30fc Author: Olivier Hallot olivier.hal...@alta.org.br Date: Tue Jan 8 15:38:10 2013 -0200 Updated core Project: dictionaries f310b731bbbaf968b513bea1dd460e5d96b0c61c Update pt-BR spell grammar checkers Change-Id: I26606dbbcaf90ac6caaaf56f0cdfa3b73364ce18 reference: VERO beta28 Reviewed-on: https://gerrit.libreoffice.org/1598 Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br Tested-by: Olivier Hallot olivier.hal...@alta.org.br diff --git a/dictionaries b/dictionaries index d047a0f..f310b73 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit d047a0fa0746ce527720d15a36907e52dc67bf47 +Subproject commit f310b731bbbaf968b513bea1dd460e5d96b0c61c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Fwd: [developerteam] Secure Web Browser Dooble - Version 1.38 released
Hi Randolph, On Tue, 2013-01-08 at 18:30 +0100, Randolph D. wrote: We are proud to announce a new Dooble release, the first of 2013. Enjoy! cf. the past length discussions on this topic; we're not terribly interested in Dooble's releases - certainly on the developer list ;-) it's good to keep the noise down there. Thanks for your interest :-) 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] .: sc/qa sw/qa
sc/qa/unit/subsequent_filters-test.cxx | 10 ++
sw/qa/core/swdoc-test.cxx |1 +
2 files changed, 11 insertions(+)
New commits:
commit 92045e69dab8be60a1c84774f04c437066c3c2bf
Author: Michael Meeks michael.me...@suse.com
Date: Tue Jan 8 18:20:16 2013 +
fix a few /tmp file leaks
Thanks to Jean-Baptiste Faure for digging for these.
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index f56bd66..a7ec15b 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -926,6 +926,8 @@ void ScFiltersTest::testBordersOoo33()
}
}
}
+
+xDocSh-DoClose();
}
void ScFiltersTest::testBugFixesODS()
@@ -1768,6 +1770,8 @@ void ScFiltersTest::testColorScaleODS()
rtl::OUStringBuffer aBuffer(getSrcRootPath());
aBuffer.append(m_aBaseString).append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/reference/)));
testColorScale_Impl(pDoc, aBuffer.makeStringAndClear());
+
+xDocSh-DoClose();
}
void ScFiltersTest::testColorScaleXLSX()
@@ -1792,6 +1796,8 @@ void ScFiltersTest::testColorScaleXLSX()
rtl::OUStringBuffer aBuffer(getSrcRootPath());
aBuffer.append(m_aBaseString).append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/reference/)));
testColorScale_Impl(pDoc, aBuffer.makeStringAndClear());
+
+xDocSh-DoClose();
}
void ScFiltersTest::testDataBarODS()
@@ -1821,6 +1827,8 @@ void ScFiltersTest::testNewCondFormat()
rtl::OUString aCSVPath;
createCSVPath( aCSVFile, aCSVPath );
testCondFile(aCSVPath, pDoc, 0);
+
+xDocSh-DoClose();
}
void ScFiltersTest::testFormulaDependency()
@@ -1849,6 +1857,8 @@ void ScFiltersTest::testFormulaDependency()
// check that the number format is implicity inherited
// CPPUNIT_ASSERT_EQUAL(pDoc-GetString(0,4,0), pDoc-GetString(0,5,0));
+
+xDocSh-DoClose();
}
ScFiltersTest::ScFiltersTest()
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index de9828e..f818cba 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -886,6 +886,7 @@ void SwDocTest::setUp()
void SwDocTest::tearDown()
{
+m_xDocShRef-DoClose();
m_xDocShRef.Clear();
delete m_pDoc;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Junk *.tmp files in /tmp after compilation
On Thu, 2013-01-03 at 20:12 +0100, Jean-Baptiste Faure wrote: Le 03/01/2013 16:48, Michael Meeks a écrit : run 'make check' - see if that leaks the files - if so, it's the 'check' rule :-) Try narrowing that down; does 'make check' inside sw/ dump stuff in /tmp (actually I'd try that first - it'd be faster. What I did : Thanks for that - most helpful :-) By doing: md5sum /tmp/lu*.tmp /tmp/sums git ls-files sc/qa/unit/data | xargs md5sum /tmp/sums sort /tmp/sums you can see that (at least from calc) one of these is sc/qa/unit/data/ods/borders_ooo33.ods (for example) and another is sc/qa/unit/data/ods/dependencyTree.ods, another is sc/qa/unit/data/xlsx/new_cond_format_test.xlsx another sc/qa/unit/data/xls/border.xls - but many of them are apparently new files - lots are empty. I nailed a few of these named / content-filled files with this: http://cgit.freedesktop.org/libreoffice/core/commit/?id=92045e69dab8be60a1c84774f04c437066c3c2bf I imagine we have similar problems in some loop in sw - any chance of doing some more identification / digging as above there ? I assume we're just forgetting to close some internally created document cleanly and it's leaking. Another thing: make creates a temp dir in /tmp but never uses it, it remains empty during the build. The name of this tempdir is a 6 random alphabetical characters word. It is not removed when the build is completed. Sure sure ;-) digging out such things is a bit of a pain. Hmm I am afraid that this is too difficult for me. Anyway I tried the command 'strace -f -s 256 -o /tmp/slog make check' in .../sc. Then exploring the slog file I found that several temp files are created and removed. Temp files are created in alphabetical order. In that case the first temp file is opened in a process with PID 32088. The first line with this PID is : execve(/home/jbf/LibO/master/solver/unxlngx6.pro/bin/cppunit/cppunittester, [/home/jbf/LibO/master/solver/unxlngx6.pro/bin/cppunit/cppunittester, /home/jbf/LibO/master/workdir/unxlngx6.pro/LinkTarget/CppunitTest/libtest_sc_ucalc.so, --headless, ... (very long command) Great :-) looks like you found the culprit. On the other hand - I suspect that this temp file is cleaned up since manually running that command I can't reproduce the leak :-) I assume that many are unlinked correctly but not all - so we'd need to find which ones are not by looking for the leaked names from /tmp in the strace of the previous run :-) 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] .: 2 commits - Makefile.in solenv/bin solenv/inc
Makefile.in |8 -
solenv/bin/modules/installer/download.pm | 131 +--
solenv/inc/installationtest.mk |6 -
3 files changed, 65 insertions(+), 80 deletions(-)
New commits:
commit c17e15a42735b5c6a756e90263a91f8e05f9c457
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jan 8 14:46:27 2013 +0100
clean up of the code that defines the download file names
Change-Id: I3241801d49673cac33eb923fb986c6ceb2c39503
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 9a8ae38..21bd62f 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -431,57 +431,64 @@ sub get_download_architecture
}
#
-# Setting the installation type for the download name
+# Setting the content type for the download name
#
-sub get_install_type
+sub get_download_content
{
my ($allvariables) = @_;
-my $type = ;
+my $content = ;
# content type included in the installer
if ( $installer::globals::isrpmbuild )
{
-$type .= rpm;
+$content = rpm;
}
elsif ( $installer::globals::isdebbuild )
{
-$type .= deb;
+$content = deb;
}
elsif ( $installer::globals::packageformat eq archive )
{
-$type .= archive;
+$content = archive;
}
-$type .= _ if ($type);
+return $content;
+}
+
+#
+# Setting the functionality type for the download name
+#
+
+sub get_download_functionality
+{
+my ($allvariables) = @_;
+
+my $functionality = ;
-# functionality type
if ( $installer::globals::languagepack )
{
-$type .= langpack;
+$functionality = langpack;
}
elsif ( $installer::globals::helppack )
{
-$type .= helppack;
+$functionality = helppack;
}
elsif ( $allvariables-{'POSTVERSIONEXTENSION'} eq SDK )
{
-$type .= sdk;
+$functionality = sdk;
}
elsif ( $allvariables-{'POSTVERSIONEXTENSION'} eq TEST )
{
-$type .= test;
+$functionality = test;
}
elsif ( $allvariables-{'PRODUCTNAME'} eq URE )
{
-$type .= ure;
+$functionality = ure;
}
-# get rid of trailing _ if functionality type was not set
-$type =~ s/\_$//;
-
-return $type;
+return $functionality;
}
###
@@ -498,21 +505,25 @@ sub set_download_filename
my $versionstring = get_download_version($allvariables);
my $platform = get_download_platformname();
my $architecture = get_download_architecture();
-my $type = get_install_type($allvariables);
+my $content = get_download_content($allvariables);
+my $functionality = get_download_functionality($allvariables);
my $language = get_downloadname_language($languagestringref);
# Setting the extension happens automatically
-my $filename = $start . _ . $versionstring . _ . _ . $platform . _
. $architecture . _ . $type . _ . $language;
+my $filename = $start . _ . $versionstring . _ . $platform . _ .
$architecture . _ . $content . _ . $functionality . _ . $language;
-$filename =~ s/\_\_/\_/g; # necessary, if $versionstring or $platform or
$language are empty
-$filename =~ s/\_\s*$//;# necessary, if $language and $addon are empty
+# get rid of duplicit _ delimiters when some strings are empty
+$filename =~ s/\_\_\_/\_/g;
+$filename =~ s/\_\_/\_/g;
+$filename =~ s/\_\s*$//;
$installer::globals::ooodownloadfilename = $filename;
return $filename;
}
+
#
# Creating a tar.gz file
#
commit a575f1243374e252e656888e04433adc5a3c4768
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jan 8 11:54:15 2013 +0100
more easier and better sortable download names
+ get rid of install_multi
+ move SDK and Test from the main name to the name suffix;
use same position as helppack and langpack
+ move the content type identification arc/deb/rpm just
after the arch string
+ use archive instead of the unclear arc content identification
The new names look like:
LibreOffice_version_os_arch_content
LibreOffice_version_os_arch_content_helppack_lang
LibreOffice_version_os_arch_content_langpack_lang
LibreOffice_version_os_arch_content_sdk
LibreOffice_version_os_arch_content_test
, where the string _content is one of _archive, _deb, _rpm.
This string is missing for .msi, and .dmg installers because
[LibreOffice-QA] Conference Call - January 11th, 2013 - 1400 UTC
Hi All, First Happy New Year! This will be our first QA call of the new year and we're excited to get back into our bi-weekly open meetings. Our next call will be: Date: Friday, January 11th, 2013 Time: 1400 UTC Duration: Approximately 1 hour This is a public meeting so anyone is welcome to join. QA policies, priorities and discussion happen during this meeting. Here is our current agenda (will be updated through Thursday): http://wiki.documentfoundation.org/QA_Call_Current_Agenda If you are joining and would like to discuss something else, please feel free to add to the agenda but be prepared to talk about the item. Best Regards, Joel -- *Joel Madero* LibO QA Volunteer jmadero@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License Statement
I hereby declare that: All my contributions, past and future, to LibreOffice are licensed under the terms of the MPL / LGPLv3+. Regards, Rushi Shukla ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Documentation for sfx2
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1599 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/1599/1 Documentation for sfx2 Change-Id: Id0df71664891ad2ced5336a7eea65c03353bbd92 Signed-off-by: Lennard Wasserthal wassert...@nefkom.net --- A sfx2/doc/sfx2doc.odg 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/sfx2/doc/sfx2doc.odg b/sfx2/doc/sfx2doc.odg new file mode 100644 index 000..01d13bb --- /dev/null +++ b/sfx2/doc/sfx2doc.odg Binary files differ -- To view, visit https://gerrit.libreoffice.org/1599 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id0df71664891ad2ced5336a7eea65c03353bbd92 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal wassert...@nefkom.net ___ 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 Joren De Cuyper joren.libreoff...@telenet.be changed: What|Removed |Added Depends on||59141 -- 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
Re: LATE FEATURE: Personas in LibreOffice
Hi, I tried with the daily from http://dev-builds.libreoffice.org/daily/libreoffice-4-0/Linux-x86_10-Release-Configuration/2013-01-07_14.50.57/ It doesn't work for me on Ubuntu 12.04 with parallel installation. The settings isn't stored at all. Cheers, Leif Den 08-01-2013 11:33, libreoffice-requ...@lists.freedesktop.org skrev: From: Olivier Hallotolivier.hal...@documentfoundation.org To: Jan Holesovskyke...@suse.cz Cc: Caol?n McNamaracaol...@redhat.com, libo-ux-advise libreoffice-ux-adv...@lists.freedesktop.org,Stefan Knorr \(Astron\)heinzless...@gmail.com, LibreOffice Developer List libreoffice@lists.freedesktop.org Subject: Re: LATE FEATURE: Personas in LibreOffice Message-ID:50ebf0e9.1090...@documentfoundation.org Content-Type: text/plain; charset=UTF-8 -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Kendy I got it working on master. Really nice work and some room or improvement as well:I wonder if the persona also has a footer to decorate the LO status bar. I got a crash on changing a persona to another, but I'll get a traceback as soon as I can. Some LibreOffice related personas http://www.getpersonas.com/en-US/gallery/All/search?p=libreofficesearch.x=0search.y=0 Regards Olivier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: [libreoffice-dev] - building difficulties with C++ extension,addIn
Hi Michael, I was able to work around the problem below by removing the platform tag. For now, I am happy with legacy active registration. I now have a working example of Calc extension in C++ (on lines of example/java/SpreadSheet/CalcAddins) Thanks for your help. I noticed that you are listed as one of the developers for soffice. Would you be able to take this code and introduce it as part of package ? Same might be done for myRNG.tar.gz. I think calc is an important part of soffice and having a c++ extension readily available would attract more users to it. It took me days to get this working, but for anyone henceforth it should be 15 min. Unfortunately, I am behind firewall and can't access gerrit. I am attaching the file with this email. If there is a better way to get it as part of installation, I'll be happy to contribute. Thanks Neeraj -Original Message- From: Rai, Neeraj [ICG-MKTS] Sent: Monday, January 07, 2013 7:30 PM To: Michael Stahl Cc: 'libreoffice@lists.freedesktop.org' Subject: [libreoffice-dev] - building difficulties with C++ extension,addIn Hi Michael, I tried your extension suggestion to convert examples/java/SpreadSheet/CalcAddins.java to C++. I am having problem installing my extension using unpkg. Error : The extension my simple extension does not work on this computer. I tried various values in META-INF/manifest.xml : platform=linux_x86_64 and platform=all but I get the same error. I probably did something wrong transporting the xml files or oxt files from the example. The original example in java works for me. Would you happen to have expertise in this area and time to help me out ? I also came across the following link which states that regmerge is legacy. However, the CalcAddIn was using it, so I went with it too. http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Deployment_Options_for_Components If that is the not the right way forward, please point me in the right direction. Thanks Neeraj -Original Message- From: Michael Stahl [mailto:mst...@redhat.com] Sent: Thursday, January 03, 2013 3:44 PM To: Rai, Neeraj [ICG-MKTS] Cc: 'libreoffice@lists.freedesktop.org' Subject: Re: [libreoffice-dev] - architecture question about interproces,extension,addIn hi Neeraj, On 03/01/13 16:54, Rai, Neeraj wrote: Based on above text, I looked at addIns but it doesn't seem like what I need. I don't want to be restricted to a function call. I need a component running in scalc. _http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Spreadsheet_Add-Ins_ Can someone please advise what is the fastest code as a C++ UNO component mean and where can I find more docs related to it. C++ UNO components that are instantiated in-process currently do not go through a bridge when interacting with the LO API (although there have been varying opinions about changing that, since it makes maintaining backward compatibility more difficult): for such components, calling a LO API method (or being called from LO itself) is just a C++ virtual function call. the best documented way to get this performance benefit is to implement your client code as an extension. http://wiki.openoffice.org/wiki/Documentation/DevGuide/Extensions/Extensions there may also be a way to get there with less efforts, there are some variables to add additional service rdbs to the soffice process (URE_MORE_SERVICES/URE_MORE_TYPES) but i don't have any experience with them; probably there is some way to implement what you want to do as a service and then start it from inside soffice, if all else fails via a trivial BASIC macro :) make.log Description: make.log Makefile Description: Makefile setenv Description: setenv component_getImplementationEnvironment component_writeInfo component_getFactory CalcAddinCpp.components Description: CalcAddinCpp.components CalcAddinCpp.idl Description: CalcAddinCpp.idl CalcAddinCpp_impl.cxx Description: CalcAddinCpp_impl.cxx ?xml version=1.0 encoding=UTF-8? !DOCTYPE manifest:manifest PUBLIC -//OpenOffice.org//DTD Manifest 1.0//EN Manifest.dtd manifest:manifest xmlns:manifest=http://openoffice.org/2001/manifest; manifest:file-entry manifest:media-type=application/vnd.sun.star.uno-typelibrary;type=RDB manifest:full-path=CalcAddinCpp.rdb/ manifest:file-entry manifest:media-type=application/vnd.sun.star.uno-components manifest:full-path=CalcAddinCpp.components/ /manifest:manifest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] turn some OSL_ENSURE into SAL_WARN_IF to avoid warnings abou...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1600
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/00/1600/1
turn some OSL_ENSURE into SAL_WARN_IF to avoid warnings about unused variables
And one OSL_ASSERT too.
Change-Id: I51f0083b9b9336e80c3b6a898c295173ad48f77c
---
M forms/source/component/errorbroadcaster.cxx
M sc/source/filter/oox/stylesbuffer.cxx
M slideshow/source/engine/transitions/fanwipe.cxx
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/forms/source/component/errorbroadcaster.cxx
b/forms/source/component/errorbroadcaster.cxx
index 8c8baac..a94efd6 100644
--- a/forms/source/component/errorbroadcaster.cxx
+++ b/forms/source/component/errorbroadcaster.cxx
@@ -45,11 +45,11 @@
//-
OErrorBroadcaster::~OErrorBroadcaster( )
{
-OSL_ENSURE( m_rBHelper.bDisposed || m_rBHelper.bInDispose,
+SAL_WARN_IF( !m_rBHelper.bDisposed !m_rBHelper.bInDispose, forms,
OErrorBroadcaster::~OErrorBroadcaster: not disposed! );
// herein, we don't have a chance to do the dispose ourself
-OSL_ENSURE( 0 == m_aErrorListeners.getLength(),
+SAL_WARN_IF( m_aErrorListeners.getLength(), forms,
OErrorBroadcaster::~OErrorBroadcaster: still have listeners! );
// either we're not disposed, or the derived class did not call our
dispose from within their dispose
}
diff --git a/sc/source/filter/oox/stylesbuffer.cxx
b/sc/source/filter/oox/stylesbuffer.cxx
index b7cc8db..58b9a7f 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -773,7 +773,7 @@
void Font::importFont( SequenceInputStream rStrm )
{
-OSL_ENSURE( !mbDxf, Font::importFont - unexpected conditional formatting
flag );
+SAL_WARN_IF( mbDxf, sc, Font::importFont - unexpected conditional
formatting flag );
sal_uInt16 nHeight, nFlags, nWeight, nEscapement;
sal_uInt8 nUnderline, nFamily, nCharSet, nScheme;
@@ -798,56 +798,56 @@
void Font::importDxfName( SequenceInputStream rStrm )
{
-OSL_ENSURE( mbDxf, Font::importDxfName - missing conditional formatting
flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfName - missing conditional
formatting flag );
maModel.maName = BiffHelper::readString( rStrm, false );
maUsedFlags.mbColorUsed = true;
}
void Font::importDxfColor( SequenceInputStream rStrm )
{
-OSL_ENSURE( mbDxf, Font::importDxfColor - missing conditional formatting
flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfColor - missing conditional
formatting flag );
rStrm maModel.maColor;
maUsedFlags.mbColorUsed = true;
}
void Font::importDxfScheme( SequenceInputStream rStrm )
{
-OSL_ENSURE( mbDxf, Font::importDxfScheme - missing conditional formatting
flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfScheme - missing conditional
formatting flag );
maModel.setBiff12Scheme( rStrm.readuInt8() );
maUsedFlags.mbSchemeUsed = true;
}
void Font::importDxfHeight( SequenceInputStream rStrm )
{
-OSL_ENSURE( mbDxf, Font::importDxfHeight - missing conditional formatting
flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfHeight - missing conditional
formatting flag );
maModel.setBiffHeight( rStrm.readuInt16() );
maUsedFlags.mbHeightUsed = true;
}
void Font::importDxfWeight( SequenceInputStream rStrm )
{
-OSL_ENSURE( mbDxf, Font::importDxfWeight - missing conditional formatting
flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfWeight - missing conditional
formatting flag );
maModel.setBiffWeight( rStrm.readuInt16() );
maUsedFlags.mbWeightUsed = true;
}
void Font::importDxfUnderline( SequenceInputStream rStrm )
{
-OSL_ENSURE( mbDxf, Font::importDxfUnderline - missing conditional
formatting flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfUnderline - missing conditional
formatting flag );
maModel.setBiffUnderline( rStrm.readuInt16() );
maUsedFlags.mbUnderlineUsed = true;
}
void Font::importDxfEscapement( SequenceInputStream rStrm )
{
-OSL_ENSURE( mbDxf, Font::importDxfEscapement - missing conditional
formatting flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfEscapement - missing
conditional formatting flag );
maModel.setBiffEscapement( rStrm.readuInt16() );
maUsedFlags.mbEscapementUsed = true;
}
void Font::importDxfFlag( sal_Int32 nElement, SequenceInputStream rStrm )
{
-OSL_ENSURE( mbDxf, Font::importDxfFlag - missing conditional formatting
flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfFlag - missing conditional
formatting flag );
bool bFlag = rStrm.readuInt8() != 0;
switch( nElement )
{
@@ -1675,7 +1675,7 @@
void Border::importDxfBorder( sal_Int32 nElement, SequenceInputStream rStrm )
{
-OSL_ENSURE( mbDxf, Border::importDxfBorder - missing conditional
silence a few WaE: private field 'foo' is not used
Matúš Kukan has abandoned this change. Change subject: silence a few WaE: private field 'foo' is not used .. Patch Set 1: Abandoned I've accidentally pushed new version with new change-id: https://gerrit.libreoffice.org/#/c/1600/ -- To view, visit https://gerrit.libreoffice.org/1566 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I96f5ceda1ae833c5ce58bd846763c003181d55a1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Crash with gnome#627420-1.ods in string related function
On Tuesday 08 of January 2013, Michael Meeks wrote: On Tue, 2013-01-08 at 05:19 -0800, julien2412 wrote: Hello Michael, Reading this thread, I took a look at sal/rtl/source/strtmpl.cxx 969 static IMPL_RTL_STRINGDATA* IMPL_RTL_STRINGNAME( ImplAlloc )( sal_Int32 nLen ) ... Since we cast nLen parameter in sal_uInt32, could it help to add an assert about nLen should be = 0 ? Could help, hopefully shouldn't hurt. Sounds great to me :-) lots of code paths to there check for a positive length I guess some mass code clean to use sal_uInt32 instead of sal_Int32 for string lengths might be in order at some stage - though perhaps there is some reason that's not obvious to me for strings to have a signed length and to check for it to be 0 around the place: perhaps for some insertion/offset API semantic corner-case reason ? It is a fallacy that using an unsigned variable to represent values that cannot be negative actually buys you safety. E.g. make a function that takes unsigned int, pass -1 to it and see how the silly C/C++ int-unsigned int promotion lets you get away with it. Even without a warning with GCC, apparently -Wconversion doesn't catch this in 4.7, Clang warns with -Wsign-conversion, but that triggers sooo many warnings, because signed types are simply inevitable. There is one thing that you will get though, and that's comparison warnings about mixing signed and unsigned types, and all the useless casts in our code that hide them. It's not like OUString needs to hold a string that's more than 2G characters long anyway. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - avmedia/README avmedia/source sw/inc sw/source
avmedia/README |5 +
avmedia/source/gstreamer/gstwindow.cxx | 101 -
avmedia/source/gstreamer/gstwindow.hxx |1
sw/inc/unocrsrhelper.hxx | 13
sw/source/core/unocore/unoobj.cxx | 87 +---
sw/source/core/unocore/unotext.cxx | 74
6 files changed, 138 insertions(+), 143 deletions(-)
New commits:
commit 1c010bd28862788038703ff7fdbbde1764cc7098
Author: Michael Meeks michael.me...@suse.com
Date: Tue Jan 8 22:07:56 2013 +
avmedia: cleanup unused listener logic in gstreamer, and update docs.
Change-Id: Ic64a4e0ed1ad194d94f5451b60e926f13ad85578
diff --git a/avmedia/README b/avmedia/README
index eaa257d..ad8120b 100644
--- a/avmedia/README
+++ b/avmedia/README
@@ -3,3 +3,8 @@ Audio/Video media implementation.
Provides per-platform implementations of multimedia functionality.
Currently no stream API is provided, only a URI based one, so
streaming has to be wrapped around it via temp files.
+
+Also provides (in source/framework/mediacontrol.cxx) an implementation
+of the graphical media playback control that appears in the toolbar /
+mediaobject bar when media is selected under the .uno:AVMediaToolBox
+item.
\ No newline at end of file
diff --git a/avmedia/source/gstreamer/gstwindow.cxx
b/avmedia/source/gstreamer/gstwindow.cxx
index a95b42f..f1d4a96 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -29,10 +29,6 @@ using namespace ::com::sun::star;
namespace avmedia { namespace gstreamer {
-// ---
-// - statics -
-// ---
-
static ::osl::Mutex ImplGetOwnStaticMutex()
{
static ::osl::Mutex* pMutex = NULL;
@@ -51,15 +47,11 @@ static ::osl::Mutex ImplGetOwnStaticMutex()
return *pMutex;
}
-// ---
-// - Window -
-// ---
-
+// Window
//
--
Window::Window( const uno::Reference lang::XMultiServiceFactory rxMgr,
Player rPlayer ) :
mxMgr( rxMgr ),
-maListeners( maMutex ),
meZoomLevel( media::ZoomLevel_NOT_AVAILABLE ),
mrPlayer( rPlayer ),
mnPointerType( awt::SystemPointer::ARROW )
@@ -68,8 +60,6 @@ Window::Window( const uno::Reference
lang::XMultiServiceFactory rxMgr, Playe
}
-//
--
-
Window::~Window()
{
}
@@ -82,8 +72,6 @@ void SAL_CALL Window::update( )
{
}
-//
--
-
sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
throw (uno::RuntimeException)
{
@@ -103,16 +91,12 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel
eZoomLevel )
return bRet;
}
-//
--
-
media::ZoomLevel SAL_CALL Window::getZoomLevel( )
throw (uno::RuntimeException)
{
return meZoomLevel;
}
-//
--
-
void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
throw (uno::RuntimeException)
{
@@ -127,8 +111,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 /*X*/,
sal_Int32 /*Y*/, sal_Int32 /*
{
}
-//
--
-
awt::Rectangle SAL_CALL Window::getPosSize()
throw (uno::RuntimeException)
{
@@ -141,122 +123,79 @@ awt::Rectangle SAL_CALL Window::getPosSize()
return aRet;
}
-//
--
-
void SAL_CALL Window::setVisible( sal_Bool /*bVisible*/ )
throw (uno::RuntimeException)
{
-
}
-//
--
-
void SAL_CALL Window::setEnable( sal_Bool /*bEnable*/ )
throw (uno::RuntimeException)
{
}
-//
--
-
void SAL_CALL Window::setFocus( )
throw (uno::RuntimeException)
{
}
-//
--
-
-void SAL_CALL Window::addWindowListener( const uno::Reference
awt::XWindowListener xListener )
+void SAL_CALL Window::addWindowListener( const uno::Reference
awt::XWindowListener )
throw (uno::RuntimeException)
{
-maListeners.addInterface( getCppuType( xListener ), xListener );
}
-//
--
-
-void SAL_CALL Window::removeWindowListener( const uno::Reference
awt::XWindowListener xListener )
+void SAL_CALL Window::removeWindowListener( const uno::Reference
awt::XWindowListener )
throw (uno::RuntimeException)
{
-maListeners.removeInterface( getCppuType( xListener ), xListener );
}
-//
