[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par6.cxx | 504 +++
1 file changed, 250 insertions(+), 254 deletions(-)
New commits:
commit 78a11f79d8eb5cd1d2b18c288852dec7e3d57a21
Author: Thomas Klausner
Date: Mon Aug 10 07:57:07 2015 +0200
Translate German comments to English, part 1.
Only about 60% done, but this file is huge, so do a checkpoint commit.
Change-Id: Ic2ea67c894c525d89baf5287c8d009727911e816
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 9d3fd16..0e587a0 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -105,10 +105,10 @@ using namespace sw::types;
using namespace ::com::sun::star;
using namespace nsHdFtFlags;
-// diverses
+// various
-#define MM_250 1417 // WW-Default fuer Hor. Seitenraender: 2.5 cm
-#define MM_200 1134 // WW-Default fuer u.Seitenrand: 2.0 cm
+#define MM_250 1417 // WW default for horizontal borders: 2.5 cm
+#define MM_200 1134 // WW default for lower border: 2.0 cm
static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRCVer9* brc,
WW8PLCFx_Cp_FKP* pPap,
@@ -134,26 +134,26 @@ inline sal_uInt32 MSRoundTweak(sal_uInt32 x)
return x;
}
-// Seiten - Attribute, die nicht ueber die Attribut-Verwaltung, sondern
-// ueber ...->HasSprm abgearbeitet werden
-// ( ausser OLST, dass weiterhin ein normales Attribut ist )
+// page attribute which are not handled via the attribute management but
+// using ...->HasSprm
+// (except OLST which stays a normal attribute)
static short ReadSprm( const WW8PLCFx_SEPX* pSep, sal_uInt16 nId, short
nDefaultVal )
{
-const sal_uInt8* pS = pSep->HasSprm( nId ); // sprm da ?
+const sal_uInt8* pS = pSep->HasSprm( nId ); // sprm here?
short nVal = ( pS ) ? SVBT16ToShort( pS ) : nDefaultVal;
return nVal;
}
static sal_uInt16 ReadUSprm( const WW8PLCFx_SEPX* pSep, sal_uInt16 nId, short
nDefaultVal )
{
-const sal_uInt8* pS = pSep->HasSprm( nId ); // sprm da ?
+const sal_uInt8* pS = pSep->HasSprm( nId ); // sprm here?
sal_uInt16 nVal = ( pS ) ? SVBT16ToShort( pS ) : nDefaultVal;
return nVal;
}
static sal_uInt8 ReadBSprm( const WW8PLCFx_SEPX* pSep, sal_uInt16 nId,
sal_uInt8 nDefaultVal )
{
-const sal_uInt8* pS = pSep->HasSprm( nId ); // sprm da ?
+const sal_uInt8* pS = pSep->HasSprm( nId ); // sprm here?
sal_uInt8 nVal = pS ? *pS : nDefaultVal;
return nVal;
}
@@ -414,10 +414,10 @@ void wwSectionManager::SetLeftRight(wwSection &rSection)
void wwSectionManager::SetPage(SwPageDesc &rInPageDesc, SwFrameFormat &rFormat,
const wwSection &rSection, bool bIgnoreCols)
{
-// 1. Orientierung
+// 1. orientation
rInPageDesc.SetLandscape(rSection.IsLandScape());
-// 2. Papiergroesse
+// 2. paper size
SwFormatFrmSize aSz( rFormat.GetFrmSize() );
aSz.SetWidth(rSection.GetPageWidth());
aSz.SetHeight(SvxPaperInfo::GetSloppyPaperDimension(rSection.GetPageHeight()));
@@ -539,7 +539,7 @@ void wwSectionManager::GetPageULData(const wwSection
&rSection,
if( rData.bHasHeader )
{
-rData.nSwUp = nWWHTop; // Header -> umrechnen
+rData.nSwUp = nWWHTop; // Header -> convert
// #i19922# - correction:
// consider that can be negative, compare only if it's positive
if ( nWWUp > 0 &&
@@ -553,7 +553,7 @@ void wwSectionManager::GetPageULData(const wwSection
&rSection,
if (rData.nSwHLo < sal::static_int_cast< sal_uInt32 >(cMinHdFtHeight))
rData.nSwHLo = sal::static_int_cast< sal_uInt32 >(cMinHdFtHeight);
}
-else // kein Header -> Up einfach uebernehmen
+else // no header -> just use Up as-is
rData.nSwUp = std::abs(nWWUp);
rData.bHasFooter = (rSection.maSep.grpfIhdt &
@@ -561,7 +561,7 @@ void wwSectionManager::GetPageULData(const wwSection
&rSection,
if( rData.bHasFooter )
{
-rData.nSwLo = nWWFBot; // Footer -> Umrechnen
+rData.nSwLo = nWWFBot; // footer -> convert
// #i19922# - correction: consider that can be negative,
compare only if it's positive
if ( nWWLo > 0 &&
static_cast(abs(nWWLo)) >= nWWFBot )
@@ -574,16 +574,16 @@ void wwSectionManager::GetPageULData(const wwSection
&rSection,
if (rData.nSwFUp < sal::static_int_cast< sal_uInt32 >(cMinHdFtHeight))
rData.nSwFUp = sal::static_int_cast< sal_uInt32 >(cMinHdFtHeight);
}
-else // kein Footer -> Lo einfach uebernehmen
+else // no footer -> just use Lo as-is
rData.nSwLo = std::abs(nWWLo);
}
void wwSectionManager::SetPageULSpaceItems(SwFrameFormat &rFormat,
wwSectionManager::wwULSpaceData& rData, const wwSection &rSection)
{
-if (rData.bHasHeader) // ... und Header-Lower setzen
+
[Bug 45789] automatic row height in reports
https://bugs.documentfoundation.org/show_bug.cgi?id=45789 --- Comment #40 from Lionel Elie Mamane --- (In reply to derrick rocha from comment #39) > Is this still an issue? Thanks. yes -- 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: Debug build breaks in unit test
On Sun, Aug 9, 2015 at 7:42 AM, Regina Henschel wrote: > Hi all, > > my build with --enable-dbgutil with VS2013 on 32-bit Windows 7 breaks in a > unit test. It is a build of an unchanged source. The log is in > http://pastebin.ca/3095468 btw any chance that you build was a mix-bag of --enable-verbose and not --enable-verbose build ? --enable-verbose has the unfortnate consequnce of exporting VERBOSE(upper case) which in turn had an impact on the compilation of some module, like canvas, sd and slideshow... Who knows what happen when a mix of objects compiled with different options will do... Norbert PS: PARALLELISM=1 should _not_ be needed... we are building literally thousands of build a month an all 3 platforms and none of these build is running PARALLELISM=1, thankfully as the build is long enough as it is... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 89592] Initialize PropertyValue Sequences from initializer_lists
https://bugs.documentfoundation.org/show_bug.cgi?id=89592 --- Comment #10 from Commit Notification --- Florian Effenberger committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=b16fb9f4096a5bc9906de4b41d39e34f8282b8c3 tdf#89592 Initialize PropertyValue Sequences from initializer_lists It will be available in 5.1.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/appserv.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit b16fb9f4096a5bc9906de4b41d39e34f8282b8c3
Author: Florian Effenberger
Date: Tue Aug 4 10:21:05 2015 +
tdf#89592 Initialize PropertyValue Sequences from initializer_lists
Change-Id: I8d7b503bde5960094b1051d38400e52ce46bf986
Reviewed-on: https://gerrit.libreoffice.org/17503
Tested-by: Jenkins
Reviewed-by: Björn Michaelsen
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 02c6d12..611d403 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -47,6 +47,7 @@
#include
#include
+#include
#include
#include
@@ -221,11 +222,10 @@ static void showDocument( const char* pBaseName )
{
try {
Reference < XDesktop2 > xDesktop = Desktop::create(
::comphelper::getProcessComponentContext() );
-Sequence < com::sun::star::beans::PropertyValue > args(2);
-args[0].Name = "ViewOnly";
-args[0].Value <<= sal_True;
-args[1].Name = "ReadOnly";
-args[1].Value <<= sal_True;
+auto args(::comphelper::InitPropertySequence({
+{"ViewOnly",makeAny(sal_True)},
+{"ReadOnly",makeAny(sal_True)}
+}));
OUString aURL;
if ( checkURL ( pBaseName, ".fodt", aURL ) ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 45789] automatic row height in reports
https://bugs.documentfoundation.org/show_bug.cgi?id=45789 --- Comment #39 from derrick rocha --- Is this still an issue? Thanks. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] website.git: Branch 'update' - check.php
check.php | 49 +++--
1 file changed, 31 insertions(+), 18 deletions(-)
New commits:
commit 605b9dbe8010573dcb95a63c44cfe625ac39c26c
Author: Christian Lohmaier
Date: Sun Aug 9 23:21:01 2015 +0200
4.4 is now stable, and 5.0 is fresh
also set type preselection to 64bit window for requests by 64bit version
of windows and account for different gitID for Linux build
diff --git a/check.php b/check.php
index 4e17992..7a4afb0 100644
--- a/check.php
+++ b/check.php
@@ -355,6 +355,21 @@ $build_hash_to_version = array(
# 4.4.5
'1b6df295803ea040dab1b48b5424da8d78d94cf0' => '4.4.5.1',
'a22f674fd25a3b6f45bdebf25400ed2adff0ff99' => '4.4.5.2', # Final
+
+##
+# 5.0.0 versions
+'77a35997fa7cff387b5b135ff0c42155f80e9884' => '5.0.0.0.a1', # alpha1
+'f0853d5c2c38b050fbfd48e09cd0bf0b400aaef8' => '5.0.0.0.a1', #
alpha1-builfix1
+'0a16c3dda4150008d9be6f24cbd15ac198d116d3' => '5.0.0.0.b1', # beta1
+'059fa2b7a3bda92168c65c61e50cc5c6fda8cfac' => '5.0.0.0.b2', # beta2
+'900960d3e4220f7e04f45c9bf45a1cd92cd06aff' => '5.0.0.0.b2', #
beta2-buildfix1
+'96345c15d8ab19c49014f055fe41ba8e1f421e5c' => '5.0.0.0.b3', # beta3
+'9a0b23dd0ab9652e0965484934309f2d49a7758e' => '5.0.0.1',
+'a26d58f11b99b6aeddf7f7884effea188cc6e512' => '5.0.0.2',
+'f79b5ba13f5e6cbad23f8038060e556217e66632' => '5.0.0.3',
+'cf112dc905650fb985306a7a03d2fe3fcc6c978f' => '5.0.0.4',
+'1b1a90865e348b492231e1c451437d7a15bb262b' => '5.0.0.5', # Final
+'437e4abdf9e72fd0a6e6f8697a0e659bc77f9b10' => '5.0.0.5', # hotfix1 (gtk
window-icon fix, linux only) Final
);
# Descriptions of the target versions
@@ -367,18 +382,18 @@ $build_hash_to_version = array(
# where '' and '' will be substitued with the right value
# NOTE: '&' in the URL has to be escaped as &
$update_map = array(
-'stable' => array('gitid' =>
'8a35821d8636a03b8bf4e15b48f59794652c68ba',
- 'id' => 'LibreOffice 4.3.7',
- 'version' => '4.3.7',
- 'update_type' => 'text/html',
- 'update_src' =>
'http://www.libreoffice.org/download/libreoffice-still/?type=&lang=&version=4.3.7',
- 'substitute' => true ),
-
-'latest' => array('gitid' =>
'a22f674fd25a3b6f45bdebf25400ed2adff0ff99',
+'stable' => array('gitid' =>
'a22f674fd25a3b6f45bdebf25400ed2adff0ff99',
'id' => 'LibreOffice 4.4.5',
'version' => '4.4.5',
'update_type' => 'text/html',
- 'update_src' =>
'http://www.libreoffice.org/download/libreoffice-fresh/?type=&lang=&version=4.4.5',
+ 'update_src' =>
'http://www.libreoffice.org/download/libreoffice-still/?type=&lang=&version=4.4.5',
+ 'substitute' => true ),
+'latest' => array('gitid' =>
'1b1a90865e348b492231e1c451437d7a15bb262b',
+ 'gitidLinux' =>
'437e4abdf9e72fd0a6e6f8697a0e659bc77f9b10',
+ 'id' => 'LibreOffice 5.0.0',
+ 'version' => '5.0.0',
+ 'update_type' => 'text/html',
+ 'update_src' =>
'http://www.libreoffice.org/download/libreoffice-fresh/?type=&lang=&version=5.0.0',
'substitute' => true ),
);
@@ -389,6 +404,7 @@ function print_update_xml($buildid, $os, $arch, $lang,
$pkgfmt) {
if(!array_key_exists($buildid, $build_hash_to_version)
|| $buildid == $update_map['stable']['gitid']
|| $buildid == $update_map['latest']['gitid']
+ || $buildid == $update_map['latest']['gitidLinux']
|| ($arch == "PowerPC" && $os == "MacOSX")
) {
error('No update for your LibreOffice version.');
@@ -459,17 +475,14 @@ function print_update_xml($buildid, $os, $arch, $lang,
$pkgfmt) {
$target_type = 'mac-x86_64';
else {
$target_type = 'mac-x86';
-if ($new == $update_map['latest']) {
-# no 4.4 update for 32bit anymore - see whether
there's newer oldstable as fallback
-$new = $update_map['stable'];
-if($buildid == $new['gitid']) {
-error('No 32bit update available - for OS X 10.8
or later, please install 64bit version of LibreOffice.');
-}
-}
- }
+error('No 32bit update available - for OS X 10.8 or later,
please install 64bit version of LibreOffice.');
+}
break;
case 'Windows':
-$target_type = 'win-x86';
+if ($arch == 'X86_64')
+$target_type = 'win-x86_64';
+else
+$target_type = 'win-x86';
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/startcenter.ui |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 9a1a6b99ebd669ee8d754db45545fa04da64b693 Author: Maxim Monastirsky Date: Sun Aug 9 23:37:17 2015 +0300 tdf#93310 No top margin for "Open Remote File" Change-Id: Ic43e99654ff28fe9a44eaed104f1847e273a51c6 diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index ef70caf..49d9e5f 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -143,7 +143,6 @@ True 6 6 -6 open_all_image none True @@ -212,8 +211,8 @@ False 12 6 -0 Create: +0 False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About tdf#75171 (Was: Re: Tutorial for debugging LO with Visual Studio)
Hi Takeshi Abe, Takeshi Abe schrieb: Hi Regina, I found the commit 4f294a90877d2f91bb88c7d6cd5b74e8e546a025 is the origin of the difference, which makes SmParser::Parse() avoid wrapping a node of type NTEXT within another node of type NEXPRESSION in simple cases. It affects SmTextNode::CreateTextFromNode() checking whether each of identifier nodes should be quoted or not. I have submitted a possible fix [1] to gerrit, while of course we still have to handle mathvariant attribute in MathML for solving the entire issue. [1] https://gerrit.libreoffice.org/17613 that is great, that you find a usable solution. There exists not only the problem of the attribute mathvariant, but a lot of more problems. But I think, that needs a separate discussion how to get a smooth transition from starmath to MathML, which is specified to be the language of equations in ODF. Kind regards Regina Cheers, -- Takeshi Abe On Sun, 02 Aug 2015 03:00:14 +0900 (JST), Takeshi Abe wrote: On Sat, 01 Aug 2015 19:24:16 +0200, Regina Henschel wrote: Unfortunately the problem is deeper. There should not be any quotes, because the element from MathML should be mapped to a variable in starmath, but actually it is mapped to a text. Removing the italic style cured only a symptom, the element has still the wrong font and is the wrong type. I agree with your view. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8toolbar.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 938a1b00332090e68cca44c99eb6f4adeedc1f00
Author: Thomas Klausner
Date: Sun Aug 9 20:28:24 2015 +0200
Fix some typos in strings.
Change-Id: I7fb077c08dbfa3fe3f03941c7567dc65630cf266
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx
b/sw/source/filter/ww8/ww8toolbar.cxx
index 429d3b5..6460cc6 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -214,7 +214,7 @@ void SwCTBWrapper::Print( FILE* fp )
for ( std::vector< Customization >::iterator it = rCustomizations.begin();
it != rCustomizations.end(); ++it, ++index )
{
-indent_printf(fp," Dumping custimization [%d]\n", static_cast< int >(
index ));
+indent_printf(fp," Dumping customization [%d]\n", static_cast< int >(
index ));
Indent c;
it->Print(fp);
}
@@ -258,7 +258,7 @@ Customization::~Customization()
bool Customization::Read( SvStream &rS)
{
-SAL_INFO("sw.ww8","Custimization::Read() stream pos 0x" << std::hex <<
rS.Tell() );
+SAL_INFO("sw.ww8","Customization::Read() stream pos 0x" << std::hex <<
rS.Tell() );
nOffSet = rS.Tell();
rS.ReadInt32( tbidForTBD ).ReadUInt16( reserved1 ).ReadUInt16( ctbds );
if ( tbidForTBD )
@@ -273,7 +273,7 @@ bool Customization::Read( SvStream &rS)
if (!aTBDelta.Read( rS ) )
return false;
customizationDataTBDelta.push_back( aTBDelta );
-// Only set the drop down for menu's associated with standard
toolbar
+// Only set the drop down for menus associated with standard
toolbar
if ( aTBDelta.ControlDropsToolBar() && tbidForTBD == 0x25 )
pWrapper->InsertDropIndex( aTBDelta.CustomizationIndex() );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 16 -- sw/uiconfig/swriter/menubar/menubar.xml |5 --- 2 files changed, 1 insertion(+), 20 deletions(-) New commits: commit 5e5dee3512f5b010b832fcf569d7a3eb60f0f62c Author: Maxim Monastirsky Date: Sun Aug 9 15:23:16 2015 + Revert "tdf#91781 Add additional selection options and go to page to menu" This reverts commit 351c17497e36c5a42fba627043dabaef2e7040eb. Change-Id: I0f1367dd4ede68183cdb8d0574a4db10997bbe49 Reviewed-on: https://gerrit.libreoffice.org/17616 Reviewed-by: Maxim Monastirsky Tested-by: Maxim Monastirsky diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index ab3148e..3ee4ec3 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -5558,22 +5558,6 @@ - - -Extended Selection - - -Extended - - - - -Adding Selection - - -Adding - - diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 40dbed3..8300196 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -37,9 +37,9 @@ - + @@ -91,8 +91,6 @@ - - @@ -101,7 +99,6 @@ - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 42346, which changed state. Bug 42346 Summary: FILESAVE: Cross-references to certain numbered items (object, graphic, table) turn to plain text on export to .doc or .docx (works OK for headings and bookmarks) https://bugs.documentfoundation.org/show_bug.cgi?id=42346 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: officecfg/registry sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 16 ++ sw/uiconfig/swriter/menubar/menubar.xml |5 ++- 2 files changed, 20 insertions(+), 1 deletion(-) New commits: commit 351c17497e36c5a42fba627043dabaef2e7040eb Author: Yousuf Philips Date: Sun Aug 9 01:02:46 2015 +0400 tdf#91781 Add additional selection options and go to page to menu Change-Id: I8ece4db5c776d8c233bdca3bee4c5fbf689baffb Reviewed-on: https://gerrit.libreoffice.org/17597 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 3ee4ec3..ab3148e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -5558,6 +5558,22 @@ + + +Extended Selection + + +Extended + + + + +Adding Selection + + +Adding + + diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 8300196..40dbed3 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -37,9 +37,9 @@ + - @@ -91,6 +91,8 @@ + + @@ -99,6 +101,7 @@ + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |2 sc/uiconfig/scalc/menubar/menubar.xml | 34 +- 2 files changed, 18 insertions(+), 18 deletions(-) New commits: commit f03a700119fc149cf1b93dfafa404b997fc2d4be Author: Yousuf Philips Date: Fri Aug 7 03:34:16 2015 +0400 tdf#91820 Moved tool items back into Tools menu Change-Id: I50e028316b505038fcfbd9c15e5d08ffc48e59e1 Reviewed-on: https://gerrit.libreoffice.org/17551 Tested-by: Jenkins Reviewed-by: Yousuf Philips diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 66566f1..6170990 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -1871,7 +1871,7 @@ - ~Name Cells + ~Named Expressions diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 43d6392..593f71c 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -97,9 +97,6 @@ - - - @@ -128,6 +125,7 @@ + @@ -185,7 +183,16 @@ - + + + + + + + + + + @@ -445,16 +452,6 @@ - - - - - - - - - - @@ -469,7 +466,6 @@ - @@ -511,8 +507,6 @@ - - @@ -592,6 +586,12 @@ + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
About tdf#75171 (Was: Re: Tutorial for debugging LO with Visual Studio)
Hi Regina, I found the commit 4f294a90877d2f91bb88c7d6cd5b74e8e546a025 is the origin of the difference, which makes SmParser::Parse() avoid wrapping a node of type NTEXT within another node of type NEXPRESSION in simple cases. It affects SmTextNode::CreateTextFromNode() checking whether each of identifier nodes should be quoted or not. I have submitted a possible fix [1] to gerrit, while of course we still have to handle mathvariant attribute in MathML for solving the entire issue. [1] https://gerrit.libreoffice.org/17613 Cheers, -- Takeshi Abe On Sun, 02 Aug 2015 03:00:14 +0900 (JST), Takeshi Abe wrote: > On Sat, 01 Aug 2015 19:24:16 +0200, Regina Henschel > wrote: >> Unfortunately the problem is deeper. There should not be any quotes, because >> the >> element from MathML should be mapped to a variable in starmath, but >> actually it is mapped to a text. Removing the italic style cured only a >> symptom, >> the element has still the wrong font and is the wrong type. > I agree with your view. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 59886, which changed state. Bug 59886 Summary: FILESAVE as .docx: Date (fixed), Time (fixed) fields become static field name text https://bugs.documentfoundation.org/show_bug.cgi?id=59886 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit da0dd0e3ba3ba9310543923b9072d82a9f7590e2 Author: Dennis Roczek Date: Sun Aug 9 14:43:44 2015 +0200 fix comment typo fir --> for Change-Id: I86be2828df897b859433eb0e06aef3e650ad7e55 Reviewed-on: https://gerrit.libreoffice.org/17610 Reviewed-by: Maxim Monastirsky Tested-by: Maxim Monastirsky diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx index 744d007..f85f372 100644 --- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx @@ -287,7 +287,7 @@ namespace drawinglayer // default creates overlapping fill which works with AntiAliasing and without. // The non-overlapping version does not create single filled polygons, but // PolyPolygons where each one describes a 'ring' for the gradient such -// that the rings will not overlap. This is useful fir the old XOR-paint +// that the rings will not overlap. This is useful for the old XOR-paint // 'trick' of VCL which is recorded in Metafiles; so this version may be // used from the MetafilePrimitive2D in it's decomposition. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Debug build breaks in unit test
Hi Regina, -> https://wiki.documentfoundation.org/Development/BuildingOnWindows#System_PATH_causing_weird_build_breakage -> BitDefender / other Anti-Virus / security tools breaking the build i told my anti virus not to scan c:\cygwin\* and c:\sources\* still working ... Regards Oliver ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/sdi sc/source
sc/sdi/scalc.sdi |6 +++---
sc/source/ui/view/cellsh1.cxx |2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 958ec9ccfe3bbe54369f9e9105c10beae80d9548
Author: Julien Nabet
Date: Sun Aug 9 12:30:40 2015 +0200
tdf#79741: Macro with Find @ Replace crash Calc
0x2f4bd163 in SfxItemSet::GetItemState (this=0x0, nWhich=26182,
bSrchInParent=true, ppItem=0x7fff1730)
at
/home/julien/compile-libreoffice/libreoffice/svl/source/items/itemset.cxx:422
422 SfxItemArray ppFnd = pAktSet->m_pItems;
(gdb) bt
0 0x2f4bd163 in SfxItemSet::GetItemState(unsigned short, bool,
SfxPoolItem const**) const (this=0x0, nWhich=26182, bSrchInParent=true,
ppItem=0x7fff1730)
at
/home/julien/compile-libreoffice/libreoffice/svl/source/items/itemset.cxx:422
1 0x2f4bd306 in SfxItemSet::HasItem(unsigned short, SfxPoolItem
const**) const (this=0x0, nWhich=26182, ppItem=0x7fff1730)
at
/home/julien/compile-libreoffice/libreoffice/svl/source/items/itemset.cxx:463
2 0x2aaacd9902c9 in ScCellShell::ExecuteEdit(SfxRequest&)
(this=0x312fe10, rReq=...) at
/home/julien/compile-libreoffice/libreoffice/sc/source/ui/view/cellsh1.cxx:1032
See https://gerrit.libreoffice.org/#/c/17603/ for details
Thank you Maxim!
Change-Id: Ie4cf31e3764c02f335830c59674a94acd6c209df
Reviewed-on: https://gerrit.libreoffice.org/17603
Reviewed-by: Maxim Monastirsky
Tested-by: Maxim Monastirsky
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 482107e..1fade23 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -3280,7 +3280,7 @@ SfxVoidItem SolverDialog SID_OPENDLG_OPTSOLVER
]
SfxVoidItem SearchResultsDialog SID_SEARCH_RESULTS_DIALOG
-()
+(SfxBoolItem Visible SID_SEARCH_RESULTS_DIALOG)
[
/* flags: */
AutoUpdate = FALSE,
@@ -3297,9 +3297,9 @@ SfxVoidItem SearchResultsDialog SID_SEARCH_RESULTS_DIALOG
/* config: */
AccelConfig = TRUE,
-MenuConfig = TRUE,
+MenuConfig = FALSE,
StatusBarConfig = FALSE,
-ToolBoxConfig = TRUE,
+ToolBoxConfig = FALSE,
GroupId = GID_OPTIONS;
]
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 254f543..54b28e1 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1029,7 +1029,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
case SID_SEARCH_RESULTS_DIALOG:
{
const SfxPoolItem* pItem = NULL;
-if (pReqArgs->HasItem(SID_SEARCH_RESULTS_DIALOG, &pItem))
+if (pReqArgs && pReqArgs->HasItem(SID_SEARCH_RESULTS_DIALOG,
&pItem))
{
bool bVisible = static_cast(pItem)->GetValue();
SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Debug build breaks in unit test
Hi Oliver, Oliver Brinzing schrieb: Hi Regina > C:/cygwin/opt/lo/bin/make -j 4 -rs -f C:/LO_buildDebug/core/Makefile.gbuildall have you tried with "PARALLELISM=1": No. But you are right, the log will be clearer. /opt/lo/bin/make gb_COLOR=1 PARALLELISM=1 C:/cygwin/opt/lo/bin/make -j 1 -rs -f D:/sources/libo-core/Makefile.gbuildall [...] i just started a new build and did not receive build breaks so far... I'll try again... Still breaks, log in http://pastebin.ca/3095612 Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Debug build breaks in unit test
Hi Regina > C:/cygwin/opt/lo/bin/make -j 4 -rs -f C:/LO_buildDebug/core/Makefile.gbuild all have you tried with "PARALLELISM=1": /opt/lo/bin/make gb_COLOR=1 PARALLELISM=1 C:/cygwin/opt/lo/bin/make -j 1 -rs -f D:/sources/libo-core/Makefile.gbuild all [...] i just started a new build and did not receive build breaks so far... Regards Oliver ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Debug build breaks in unit test
Hi all, my build with --enable-dbgutil with VS2013 on 32-bit Windows 7 breaks in a unit test. It is a build of an unchanged source. The log is in http://pastebin.ca/3095468 Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Error -1073740940
On Sun, Aug 9, 2015 at 6:59 AM, Regina Henschel wrote: > Hi all, > > obviously the zip-file was stripped. The log is here > http://pastebin.ca/3095468. That is a completely different issue, that deserve it's own thread. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Error -1073740940
Hi all, obviously the zip-file was stripped. The log is here http://pastebin.ca/3095468. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Error -1073740940
Hi Norbert, Norbert Thiebaud schrieb: --enable-verbose is messed-up in configure.ac it set VERBOSE to --enable-verbose -> YES --disable-verbose -> NO neither -> empty and then VERBOSE is exported via config_host.mk But gmake and most of the rest of the build use verbose=non-empty/empty as a test typically $(if $(verbose)$(VERBOSE),,)) some isolated place have a test of VERBOSE= YES/NO which conflict with the semantic of verbose all that being said... verbose=t make does also fails on Windows when ran at the top level, very early on while processing the Dep targets apparently.. make --debug=all did not provide much more info.. short of building a debug version of make and taking a core, it is hard to guess what is going on, but very likely some buffer overrun bug in make itself So.. don't do that do not use --enable-verbose (for the reason stated at the top of this post.. it is broken) and do not use verbose=t at the top level, it is really not that useful anyway, except to fill you disk with a huge build log) as it drown the ouput in tons of useless details I have removed --enable-verbose now. Now it goes so far, that I get an usable soffice.exe. But beyond that it fails in a unit test. I try to attach the zipped log, don't know whether it comes through to the list. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Crash test update, 0/0 with
On Sun, 2015-08-09 at 08:41 +, Crashtest VM wrote: > New crashtest update available at http://dev-builds.libreoffice.org/c > rashtest/2981bcf7e34d9f4c9d1e821045f3f22ddb318339/ Thanks to mstahl, that's our first 0 import failure + 0 export failure on the refreshed 79990 bugzilla document corpus. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Error -1073740940
Hi, > So.. don't do that do not use --enable-verbose (for the reason > stated at the top of this post.. it is broken) ok, i removed "--enable-verbose", but now i am getting build errors again, for example: C:/cygwin/opt/lo/bin/make -j 4 -rs -f C:/sources/libo-core/Makefile.gbuild all [ C ] solenv/bin/concat-deps.c [ CXX ] soltools/mkdepend/collectdircontent.cxx [...] [ RC ] pdfimport/default [ RC ] pyuno/default [ RC ] pythonloader/default make[1]: ***. Stop. make[1]: Makefile:250: recipe for target 'build' failed make: *** [build] Error 2 if i try again with "/opt/lo/bin/make fetch gb_COLOR=1" it will continue but stop again and again ... my configuration is: /cygdrive/c/sources/libo-core/autogen.sh \ > --with-build-version="$(date +"%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)")" \ > --with-vendor="LO Debug Build" \ > --with-external-tar=/cygdrive/c/sources/lo-externalsrc \ > --with-junit=/cygdrive/c/sources/junit-4.10.jar \ > --with-ant-home=/cygdrive/c/sources/apache-ant-1.9.5 \ > --disable-ccache \ > --enable-pch \ > --without-fonts \ > --with-lang="de" \ > --with-package-format="installed msi" \ > --without-junit \ > --enable-dbgutil \ > --enable-debug \ > --enable-crashdump \ > --disable-odk \ > --disable-online-update main::scan_file() called too early to check prototype at /usr/bin/aclocal-1.11 line 644. Running ./configure with '--with-build-version=2015-08-09 11:11:05 +0200 (So, 09 Aug 2015)' '--with-vendor=LO Debug Build' '--with-external-tar=/cygdrive/c/sources/lo-externalsrc' '--with-junit=/cygdrive/c/sources/junit-4.10.jar' '--with-ant-home=/cygdrive/c/sources/apache-ant-1.9.5' '--disable-ccache' '--enable-pch' '--without-fonts' '--with-lang=de' '--with-package-format=installed msi' '--without-junit' '--enable-dbgutil' '--enable-debug' '--enable-crashdump' '--disable-odk' '--disable-online-update' '--srcdir=/cygdrive/c/sources/libo-core' '--enable-option-checking=fatal' Regards Oliver ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/2981bcf7e34d9f4c9d1e821045f3f22ddb318339/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/tbcontrl.cxx | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 7d3fa6bae9f7a755eb2d0ca24bf1afd5f3646bb7
Author: Maxim Monastirsky
Date: Sun Aug 9 11:33:03 2015 +0300
tdf#93290 Limit the size request of the styles combobox
Change-Id: I1ef697008dcd5e993c1d509fce055c5454d80f40
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index de0933b..a83a22c 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -164,6 +164,7 @@ private:
static void UserDrawEntry(const UserDrawEvent& rUDEvt, const OUString
&rStyleName);
voidSetupEntry(vcl::RenderContext& rRenderContext,
vcl::Window* pParent, sal_uInt16 nItem, const Rectangle& rRect, const OUString&
rStyleName, bool bIsNotSelected);
static bool AdjustFontForItemHeight(OutputDevice* pDevice, Rectangle&
rTextRect, long nHeight);
+voidSetOptimalSize();
DECL_LINK( MenuSelectHdl, Menu * );
};
@@ -333,6 +334,7 @@ SvxStyleBox_Impl::SvxStyleBox_Impl(vcl::Window* pParent,
for(int i = 0; i < MAX_STYLES_ENTRIES; i++)
m_pButtons[i] = NULL;
aLogicalSize = PixelToLogic( GetSizePixel(), MAP_APPFONT );
+SetOptimalSize();
EnableAutocomplete( true );
EnableUserDraw( true );
SetUserItemSize( Size( 0, ITEM_HEIGHT ) );
@@ -541,7 +543,7 @@ void SvxStyleBox_Impl::DataChanged( const DataChangedEvent&
rDCEvt )
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
-SetSizePixel(LogicToPixel(aLogicalSize, MAP_APPFONT));
+SetOptimalSize();
}
ComboBox::DataChanged( rDCEvt );
@@ -582,6 +584,14 @@ bool
SvxStyleBox_Impl::AdjustFontForItemHeight(OutputDevice* pDevice, Rectangle&
return false;
}
+void SvxStyleBox_Impl::SetOptimalSize()
+{
+Size aSize(LogicToPixel(aLogicalSize, MAP_APPFONT));
+set_width_request(aSize.Width());
+set_height_request(aSize.Height());
+SetSizePixel(aSize);
+}
+
void SvxStyleBox_Impl::UserDrawEntry(const UserDrawEvent& rUDEvt, const
OUString &rStyleName)
{
vcl::RenderContext *pDevice = rUDEvt.GetRenderContext();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vba-export' - oox/source
oox/source/ole/vbaexport.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 091ed8e0cfe6c8be5dee0586cc0ef43a20853cdf
Author: Rosemary
Date: Sun Aug 9 10:57:54 2015 +0530
PROJECTLCID record
Change-Id: Ib672f479785fc20002e5905ebe7c02c31e6e9964
Reviewed-on: https://gerrit.libreoffice.org/17599
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index b5141b1..d075ffe 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -26,6 +26,14 @@ VbaExport::VbaExport(css::uno::Reference
xModel):
namespace {
+// section 2.3.4.2.1.2
+void writePROJECTLCID(SvStream& rStrm)
+{
+rStrm.WriteUInt16(0x0002); // id
+rStrm.WriteUInt32(0x0004); // size
+rStrm.WriteUInt32(0x0409); // Lcid
+}
+
// section 2.3.4.2.1.1
void writePROJECTSYSKIND(SvStream& rStrm)
{
@@ -38,6 +46,7 @@ void writePROJECTSYSKIND(SvStream& rStrm)
void writePROJECTINFORMATION(SvStream& rStrm)
{
writePROJECTSYSKIND(rStrm);
+writePROJECTLCID(rStrm);
}
// section 2.3.4.2
@@ -51,7 +60,7 @@ void exportDirStream(SvStream& rStrm)
void VbaExport::exportVBA()
{
// start here with the VBA export
-const OUString aDirFileName("/home/moggi/Documents/temp/vba_dir_out.bin");
+const OUString aDirFileName("/tmp/vba_dir_out.bin");
SvFileStream aDirStream(aDirFileName, StreamMode::WRITE);
// export
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
