[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5f58b80f7355f5947635d70b54b3e87a7421d8fd Author: Andras Timar Date: Sat Jun 15 08:30:45 2013 +0200 Updated core Project: translations 6a224315f0e1cb8c3650773dc5482cc9e41e31ac diff --git a/translations b/translations index f56..6a22431 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit f564891d2bfebc1682cd2f829f243e33b6a9 +Subproject commit 6a224315f0e1cb8c3650773dc5482cc9e41e31ac ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2b2a27ed4452e5b6dbdd0036fa521663111c671d Author: Andras Timar Date: Sat Jun 15 08:30:45 2013 +0200 Updated core Project: translations 27c79c7d3fa134bf63e6397000b3fc31ad758567 diff --git a/translations b/translations index 0951535..27c79c7 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 0951535c576e6a2693b25311832b25bcd67b7bb3 +Subproject commit 27c79c7d3fa134bf63e6397000b3fc31ad758567 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bd4f52071c56f0fd040c2a3cadae6d686dc49b73 Author: Andras Timar Date: Sat Jun 15 08:20:58 2013 +0200 Updated core Project: help eaee7e51ffbaddde5c50c9b5b281e3a46d97146a diff --git a/helpcontent2 b/helpcontent2 index 702b7c3..eaee7e5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 702b7c31afda76b683c24ca5b6ea4c75fcc02198 +Subproject commit eaee7e51ffbaddde5c50c9b5b281e3a46d97146a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-4-1' - source/text
source/text/shared/guide/print_faster.xhp |8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) New commits: commit eaee7e51ffbaddde5c50c9b5b281e3a46d97146a Author: Andras Timar Date: Sat Jun 15 08:20:58 2013 +0200 typo/help l10n extraction error Change-Id: Idc1b278d509ffcc35687b95393ef1fb7f6c397c5 diff --git a/source/text/shared/guide/print_faster.xhp b/source/text/shared/guide/print_faster.xhp index 9488804..d3715c8 100644 --- a/source/text/shared/guide/print_faster.xhp +++ b/source/text/shared/guide/print_faster.xhp @@ -52,12 +52,8 @@ Click one of the following settings options: - -Printer -- to define options for reducing data while printing directly to a printer - -Print to file -- to define options for reducing data while printing to a file +Printer - to define options for reducing data while printing directly to a printer +Print to file - to define options for reducing data while printing to a file Select any combination of the four options, then click OK. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/guide/print_faster.xhp |8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) New commits: commit aac86abaa8bf30756159131de9f951141ba5181f Author: Andras Timar Date: Sat Jun 15 08:20:58 2013 +0200 typo/help l10n extraction error Change-Id: Idc1b278d509ffcc35687b95393ef1fb7f6c397c5 diff --git a/source/text/shared/guide/print_faster.xhp b/source/text/shared/guide/print_faster.xhp index 9488804..d3715c8 100644 --- a/source/text/shared/guide/print_faster.xhp +++ b/source/text/shared/guide/print_faster.xhp @@ -52,12 +52,8 @@ Click one of the following settings options: - -Printer -- to define options for reducing data while printing directly to a printer - -Print to file -- to define options for reducing data while printing to a file +Printer - to define options for reducing data while printing directly to a printer +Print to file - to define options for reducing data while printing to a file Select any combination of the four options, then click OK. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4304f4f5043fc29b04479581d47941b2947ecdf8 Author: Andras Timar Date: Sat Jun 15 08:20:58 2013 +0200 Updated core Project: help aac86abaa8bf30756159131de9f951141ba5181f diff --git a/helpcontent2 b/helpcontent2 index da1f6d1..aac86ab 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit da1f6d1195f1bd42bd4abbea49416bede5f6b069 +Subproject commit aac86abaa8bf30756159131de9f951141ba5181f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - external_deps.lst officecfg/registry
external_deps.lst|6 - officecfg/registry/data/org/openoffice/Office/Common.xcu | 58 +++ officecfg/registry/data/org/openoffice/Office/Writer.xcu |6 + 3 files changed, 65 insertions(+), 5 deletions(-) New commits: commit 10a7481b927d3a9940eeeff4f3ea09f2506d36de Author: Ariel Constenla-Haile Date: Sat Jun 15 04:15:20 2013 + i122518 - Partial revert of revision 1465678 diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index dcfee1d..db9480b 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -32,10 +32,68 @@ +true +false +true +true +true +true +true true +true +true +true +true +true +true +true +true +true +true +true +true +true +true +true +true +true +true +true +true +true +true +10 +10 +10 +10 +0 +10 10 +10 +10 +10 +10 +10 +10 +10 +10 +10 +13 +10 +10 +10 +10 +10 +10 +13 +13 +13 +13 +13 +13 +13 diff --git a/officecfg/registry/data/org/openoffice/Office/Writer.xcu b/officecfg/registry/data/org/openoffice/Office/Writer.xcu index 992b135..429f571 100644 --- a/officecfg/registry/data/org/openoffice/Office/Writer.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Writer.xcu @@ -50,7 +50,8 @@ - true + + true @@ -701,7 +702,8 @@ - 740 +1250 +740 commit a8d5cd07fabbf7a30b79b9378b0ea042e652 Author: Ariel Constenla-Haile Date: Sat Jun 15 04:15:06 2013 + i121823 - Update serf to new version 1.2.1 diff --git a/external_deps.lst b/external_deps.lst index 5e02b96..3c14624 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -126,9 +126,9 @@ if ( true ) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if ( true ) -SHA1 = 30b29bd9214d50887abcc20cf82096aaaf5d1d61 -name = serf-1.2.0.tar.bz2 -URL1 = http://serf.googlecode.com/files/serf-1.2.0.tar.bz2 +SHA1 = f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd +name = serf-1.2.1.tar.bz2 +URL1 = http://serf.googlecode.com/files/serf-1.2.1.tar.bz2 URL2 = $(OOO_EXTRAS)$(SHA1)-$(name) if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News 2013-06-15
Moin! * Open changes on master for project core changed in the last 25 hours: fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO in https://gerrit.libreoffice.org/4286 from Ioan Radu fdo#65456 - Provide visual clues in slidesorter for custom animation. in https://gerrit.libreoffice.org/4277 from Edmond Ciorba Get rid of SalLayout::GetFallbackFontData() in https://gerrit.libreoffice.org/4285 from Khaled Hosny fdo#59427 first step for template menu in https://gerrit.libreoffice.org/4284 from Cor Nouws Cleaning: remove use of old edt1 from dlg.h (Windows) in https://gerrit.libreoffice.org/4283 from Julien Nabet rtl: add global empty oustring in https://gerrit.libreoffice.org/4264 from Norbert Thiebaud String to OUString (SfxStringItem and related) in https://gerrit.libreoffice.org/4280 from Matteo Casalin Remove useless attributions in starmath in https://gerrit.libreoffice.org/4282 from Marcos Souza solenv/bin: remove unreferenced obsoleted scripts in https://gerrit.libreoffice.org/4239 from Matúš Kukan cppcheck: fix duplicateExpression in https://gerrit.libreoffice.org/4279 from Julien Nabet * Merged changes on master for project core changed in the last 25 hours: cppcheck: fix operatorEqVarError (in lotuswordpro) in https://gerrit.libreoffice.org/4281 from Julien Nabet * Abandoned changes on master for project core changed in the last 25 hours: String -> OUString of unotools Tempfile and related... in https://gerrit.libreoffice.org/4243 from Norbert Thiebaud String=>OUString svl touch-up in https://gerrit.libreoffice.org/4266 from Norbert Thiebaud String=>OUString clean-up header include in tools and misc touch-up in https://gerrit.libreoffice.org/4265 from Norbert Thiebaud String=OUString part of linguistic in https://gerrit.libreoffice.org/4263 from Norbert Thiebaud String=>OUString svtools trasnfer* in https://gerrit.libreoffice.org/4262 from Norbert Thiebaud String=>OUString svtools grfmgr + fmtfield in https://gerrit.libreoffice.org/4261 from Norbert Thiebaud String=>OUString yet another random batch starting from svtools in https://gerrit.libreoffice.org/4260 from Norbert Thiebaud String=>OUString svtools inetimg in https://gerrit.libreoffice.org/4259 from Norbert Thiebaud String=>OUString svtools imap in https://gerrit.libreoffice.org/4258 from Norbert Thiebaud String=>OUString virtual getStateDisplayName in https://gerrit.libreoffice.org/4257 from Norbert Thiebaud String=>OUString : svtools inettbc in https://gerrit.libreoffice.org/4256 from Norbert Thiebaud String=>OUString svtools/fileview and dep in https://gerrit.libreoffice.org/4255 from Norbert Thiebaud String=>OUString another daily wack at it in https://gerrit.libreoffice.org/4254 from Norbert Thiebaud String=>OUString big chunk of paring related code in https://gerrit.libreoffice.org/4253 from Norbert Thiebaud String=>OUString svl ddedummy in https://gerrit.libreoffice.org/4252 from Norbert Thiebaud String=>OUString in svl in https://gerrit.libreoffice.org/4251 from Norbert Thiebaud String=>OUString and sal_Bool=>bool for the module sot in https://gerrit.libreoffice.org/4250 from Norbert Thiebaud Strin->OUString unotools textsearch and dep in https://gerrit.libreoffice.org/4249 from Norbert Thiebaud String->OUString more unotools in https://gerrit.libreoffice.org/4248 from Norbert Thiebaud String->OUString few more from unotools in https://gerrit.libreoffice.org/4247 from Norbert Thiebaud String->OUString unotools syslocaloptions and related in https://gerrit.libreoffice.org/4246 from Norbert Thiebaud String->OUString unotools, ucbstreamhelper in https://gerrit.libreoffice.org/4245 from Norbert Thiebaud String->OUString unotools's pathoptions and related stuff in https://gerrit.libreoffice.org/4244 from Norbert Thiebaud daily wackin
[Libreoffice-commits] core.git: 2 commits - extensions/source
extensions/source/update/check/download.cxx |2 --
extensions/source/update/check/updateprotocol.cxx |2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit f4a4fee523ff8a6d272eabda2ce9ca96bd31
Author: Stephan Bergmann
Date: Sat Jun 15 01:03:22 2013 +0200
loplugin:literalalternative
Change-Id: Ie2af2b013f95e8cdf7aab82498ce686dfa965cc8
diff --git a/extensions/source/update/check/updateprotocol.cxx
b/extensions/source/update/check/updateprotocol.cxx
index 59ef0d9..7ad26518 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -171,7 +171,7 @@ checkForUpdates(
{
uno::Reference< xml::dom::XElement >
xParent(xNode2->getParentNode(), uno::UNO_QUERY_THROW);
OUString aType = xParent->getAttribute("type");
-bool bIsDirect = ( sal_False ==
aType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("text/html")) );
+bool bIsDirect =
!aType.equalsIgnoreAsciiCase("text/html");
o_rUpdateInfo.Sources.push_back(
DownloadSource(bIsDirect, xNode2->getNodeValue()) );
}
commit c128736aad595cdb4de9ced2b6471f1c05806546
Author: Stephan Bergmann
Date: Sat Jun 15 00:57:19 2013 +0200
loplugin:unusedvariablecheck
Change-Id: I2202b5fcca4bf4c0a552d25c5c363209fcb6bd84
diff --git a/extensions/source/update/check/download.cxx
b/extensions/source/update/check/download.cxx
index 3ceb70a..4660da3 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -104,8 +104,6 @@ static void openFile( OutData& out )
static inline OString
getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess,
const OUString& aName)
{
-OString aRet;
-
OSL_ASSERT(xNameAccess->hasByName(aName));
uno::Any aValue = xNameAccess->getByName(aName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4286 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/4286/1 fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO - replaced RTL_CONTEXT_ with SAL_INFO - replace OSL_* with SAL_* Change-Id: If89af70767c3fdc4b1d0cb5e51033ca98583bc5d --- M canvas/source/cairo/cairo_canvascustomsprite.cxx M canvas/source/cairo/cairo_canvashelper.cxx M canvas/source/cairo/cairo_spritehelper.cxx M canvas/source/directx/dx_canvascustomsprite.cxx M canvas/source/directx/dx_canvashelper.cxx M canvas/source/directx/dx_spritehelper.cxx M connectivity/source/commontools/FValue.cxx M connectivity/source/commontools/TSkipDeletedSet.cxx M connectivity/source/drivers/calc/CCatalog.cxx M connectivity/source/drivers/calc/CConnection.cxx M connectivity/source/drivers/calc/CDatabaseMetaData.cxx M connectivity/source/drivers/calc/CTable.cxx M connectivity/source/drivers/calc/CTables.cxx M connectivity/source/drivers/dbase/DDatabaseMetaData.cxx M connectivity/source/drivers/dbase/DTable.cxx M connectivity/source/drivers/file/FCatalog.cxx M connectivity/source/drivers/file/FDatabaseMetaData.cxx M connectivity/source/drivers/file/FDriver.cxx M connectivity/source/drivers/file/FNoException.cxx M connectivity/source/drivers/file/FPreparedStatement.cxx M connectivity/source/drivers/file/FResultSet.cxx M connectivity/source/drivers/file/FResultSetMetaData.cxx M connectivity/source/drivers/file/FStatement.cxx M connectivity/source/drivers/file/FStringFunctions.cxx M connectivity/source/drivers/file/FTable.cxx M connectivity/source/drivers/file/fcode.cxx M connectivity/source/drivers/file/quotedstring.cxx M connectivity/source/drivers/flat/EDatabaseMetaData.cxx M connectivity/source/drivers/flat/ETable.cxx M connectivity/source/drivers/hsqldb/StorageFileAccess.cxx M connectivity/source/drivers/jdbc/Clob.cxx M connectivity/source/drivers/jdbc/Object.cxx M connectivity/source/drivers/jdbc/ResultSet.cxx M connectivity/source/drivers/jdbc/ResultSetMetaData.cxx M connectivity/source/drivers/odbcbase/OResultSet.cxx M connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx M connectivity/source/drivers/odbcbase/OTools.cxx M connectivity/source/parse/sqliterator.cxx M connectivity/source/parse/sqlnode.cxx M include/sal/log-areas.dox 40 files changed, 872 insertions(+), 907 deletions(-) -- To view, visit https://gerrit.libreoffice.org/4286 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If89af70767c3fdc4b1d0cb5e51033ca98583bc5d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ioan Radu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/request.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 8e8e338fb30f236dcc5ade0f966245d4ba97a608 Author: Julien Nabet Date: Fri Jun 14 23:43:35 2013 +0200 cppcheck: fix some uninitMemberVar Change-Id: Ie26e5adf2324f2af0a48c06d86545acf2acb1873 diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index d2a8a10..3fa1855 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -75,6 +75,9 @@ struct SfxRequest_Impl: public SfxListener SfxRequest_Impl( SfxRequest *pOwner ) : pAnti( pOwner) , pPool(0) +, pRetVal(0) +, pShell(0) +, pSlot(0) , nModifier(0) , bCancelled(sal_False) , nCallMode( SFX_CALLMODE_SYNCHRON ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/menu.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 73fc0f7a00f9b0d395709c302347d702b763f48b
Author: Julien Nabet
Date: Fri Jun 14 23:39:36 2013 +0200
cppcheck: fix uninitMemberVar in menu.cxx (vcl)
Just add those detected by cppcheck, should the others also be taken into
account?
Change-Id: I4f86afc787d2416b829e332272331a5caa146d45
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 2d39189..aeb2d3d 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -136,11 +136,14 @@ struct MenuItemData
SalMenuItem*pSalMenuItem; // access to native menu
MenuItemData() :
-pSalMenuItem ( NULL )
+pSubMenu(NULL), pAutoSubMenu(NULL),
nItemImageAngle(0), pSalMenuItem ( NULL )
{}
MenuItemData( const XubString& rStr, const Image& rImage )
:
+pSubMenu(NULL),
+pAutoSubMenu(NULL),
aText( rStr ),
aImage( rImage ),
+nItemImageAngle(0),
pSalMenuItem ( NULL )
{}
~MenuItemData();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/pngread.cxx |4 1 file changed, 4 insertions(+) New commits: commit 3ae9f3ad1fb584d9b266dd8b09bc4d2c441557c4 Author: Julien Nabet Date: Fri Jun 14 23:34:08 2013 +0200 cppcheck: fix uninitMemberVar in pngread (vcl) Change-Id: I3ae05baa652c239322554ef76bda5061d8cc0968 diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index 777cb36..c9e9b9d 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -168,7 +168,11 @@ PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream ) mpScanCurrent ( NULL ), mpColorTable( (sal_uInt8*) mpDefaultColorTable ), mnPass ( 0 ), +mbTransparent( false ), +mbAlphaChannel( false ), +mbRGBTriple( false ), mbPalette( false ), +mbGrayScale( false ), mbzCodecInUse ( false ), mbStatus( true ), mbIDAT( false ), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 65569, which changed state. Bug 65569 Summary: UI LibreOffice native file dialog does not offer selection list to choose from names that have the same start https://bugs.freedesktop.org/show_bug.cgi?id=65569 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - fpicker/source oox/source svtools/source
fpicker/source/office/iodlg.src|3
oox/source/core/filterdetect.cxx | 315 ++---
svtools/source/control/inettbc.cxx |4
3 files changed, 301 insertions(+), 21 deletions(-)
New commits:
commit 4e9f9b745fdf87bce2e2cc286849989364c3bd30
Author: Caolán McNamara
Date: Fri Jun 14 20:30:11 2013 +0100
Resolves: fdo#65569 dropdown list missing from built-in fpicker
regression since a8c2cb0e6d0b9b301887be176694592f8ecda0c4
the different ctors have different defaults around whether
they show the dropdown or not.
Change-Id: I3d1bb423c8a25b81ffb26981b63af7498f99e70a
(cherry picked from commit 6a4e3194bb16b595885e2814c92ace8911f9a5f3)
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index a4282d0..0524547 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -120,6 +120,9 @@ ModalDialog DLG_FPICKER_EXPLORERFILE
Pos = MAP_APPFONT ( 59 , 117 ) ;
Size = MAP_APPFONT ( 159 , 12 ) ;
Border = TRUE ;
+DropDown = TRUE ;
+AutoSize = TRUE ;
+AutoHScroll = TRUE ;
};
FixedText FT_EXPLORERFILE_SHARED_LISTBOX
{
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index 917639d..5ff01ab 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -899,10 +899,12 @@ void SvtURLBox::Init(bool bSetDefaultHelpID)
SetHelpId( ".uno:OpenURL" );
EnableAutocomplete( sal_False );
-SetText( String() );
+SetText( OUString() );
GetSubEdit()->SetAutocompleteHdl( LINK( this, SvtURLBox,
AutoCompleteHdl_Impl ) );
UpdatePicklistForSmartProtocol_Impl();
+
+EnableAutoSize(GetStyle() & WB_AUTOSIZE);
}
SvtURLBox::~SvtURLBox()
commit 56a3a2b253552826a6b5cc13500df739d3875974
Author: Caolán McNamara
Date: Thu Jun 13 16:02:58 2013 +0100
enc foo
Change-Id: Idae2ae3f04f36504d5c15f980c251461b383064e
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index 3d84a94a..abf2f73 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -39,6 +39,9 @@
#include "oox/helper/zipstorage.hxx"
#include "oox/ole/olestorage.hxx"
#include
+#include
+#include
+#include
namespace oox {
namespace core {
@@ -49,6 +52,7 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::xml::dom;
using namespace ::com::sun::star::xml::sax;
using ::comphelper::MediaDescriptor;
@@ -280,6 +284,7 @@ const sal_uInt32 ENCRYPTINFO_CRYPTOAPI = 0x0004;
const sal_uInt32 ENCRYPTINFO_DOCPROPS = 0x0008;
const sal_uInt32 ENCRYPTINFO_EXTERNAL = 0x0010;
const sal_uInt32 ENCRYPTINFO_AES= 0x0020;
+const sal_uInt32 ENCRYPTINFO_AGILE = 0x0040;
const sal_uInt32 ENCRYPT_ALGO_AES128= 0x660E;
const sal_uInt32 ENCRYPT_ALGO_AES192= 0x660F;
@@ -311,30 +316,296 @@ struct PackageEncryptionInfo
sal_uInt32 mnVerifierHashSize;
};
-bool lclReadEncryptionInfo( PackageEncryptionInfo& rEncrInfo,
BinaryInputStream& rStrm )
+bool lclReadEncryptionInfo( const Reference< XComponentContext >& rxContext,
+PackageEncryptionInfo& rEncrInfo, Reference< XInputStream >& rxStrm )
{
-rStrm.skip( 4 );
-rStrm >> rEncrInfo.mnFlags;
+BinaryXInputStream aInfoStrm( rxStrm, true );
+aInfoStrm.skip( 4 );
+aInfoStrm >> rEncrInfo.mnFlags;
if( getFlag( rEncrInfo.mnFlags, ENCRYPTINFO_EXTERNAL ) )
return false;
-sal_uInt32 nHeaderSize, nRepeatedFlags;
-rStrm >> nHeaderSize >> nRepeatedFlags;
-if( (nHeaderSize < 20) || (nRepeatedFlags != rEncrInfo.mnFlags) )
-return false;
+if( getFlag( rEncrInfo.mnFlags, ENCRYPTINFO_AGILE) )
+{
+//in this mode the info follows in xml format
-rStrm.skip( 4 );
-rStrm >> rEncrInfo.mnAlgorithmId >> rEncrInfo.mnAlgorithmIdHash >>
rEncrInfo.mnKeySize;
-rStrm.skip( nHeaderSize - 20 );
-rStrm >> rEncrInfo.mnSaltSize;
-if( rEncrInfo.mnSaltSize != 16 )
-return false;
+fprintf(stderr, "AGILE\n");
+
+Reference xDomBuilder(
+DocumentBuilder::create(rxContext));
+
+fprintf(stderr, "dom\n");
+
+Reference xDom(
+xDomBuilder->parse(rxStrm),
+UNO_QUERY_THROW );
+
+fprintf(stderr, "loaded\n");
+
+Reference xDocElem( xDom->getDocumentElement(),
+UNO_QUERY_THROW );
+
+fprintf(stderr, "has root\n");
+
+Reference< XNodeList > keyDataList = xDocElem->getElementsByTagNameNS(
+"http://schemas.microsoft.com/office/2006/encryption";, "keyData");
+
+fprintf(stderr, "nodelist is %d\n", keyDataList.is() &&
keyDataList->getLength() > 0);
+
+if (!keyDat
[Libreoffice-commits] core.git: fpicker/source svtools/source
fpicker/source/office/iodlg.src|3 +++
svtools/source/control/inettbc.cxx |4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 6a4e3194bb16b595885e2814c92ace8911f9a5f3
Author: Caolán McNamara
Date: Fri Jun 14 20:30:11 2013 +0100
Resolves: fdo#65569 dropdown list missing from built-in fpicker
regression since a8c2cb0e6d0b9b301887be176694592f8ecda0c4
the different ctors have different defaults around whether
they show the dropdown or not.
Change-Id: I3d1bb423c8a25b81ffb26981b63af7498f99e70a
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index a4282d0..0524547 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -120,6 +120,9 @@ ModalDialog DLG_FPICKER_EXPLORERFILE
Pos = MAP_APPFONT ( 59 , 117 ) ;
Size = MAP_APPFONT ( 159 , 12 ) ;
Border = TRUE ;
+DropDown = TRUE ;
+AutoSize = TRUE ;
+AutoHScroll = TRUE ;
};
FixedText FT_EXPLORERFILE_SHARED_LISTBOX
{
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index 917639d..5ff01ab 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -899,10 +899,12 @@ void SvtURLBox::Init(bool bSetDefaultHelpID)
SetHelpId( ".uno:OpenURL" );
EnableAutocomplete( sal_False );
-SetText( String() );
+SetText( OUString() );
GetSubEdit()->SetAutocompleteHdl( LINK( this, SvtURLBox,
AutoCompleteHdl_Impl ) );
UpdatePicklistForSmartProtocol_Impl();
+
+EnableAutoSize(GetStyle() & WB_AUTOSIZE);
}
SvtURLBox::~SvtURLBox()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/gdi/salbmp.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0be8f5aed649d2de8ba858835ee70a440d66f6d7
Author: Caolán McNamara
Date: Fri Jun 14 20:03:55 2013 +0100
if we have to define min/max then use those again
Change-Id: I631f0c872b7ec7e6dada1488e03eae3f75987fc6
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 72bc268..15b4698 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -796,7 +796,7 @@ HGLOBAL WinSalBitmap::ImplCreateDIB( const Size& rSize,
sal_uInt16 nBits, const
if( nColors )
{
// copy the palette entries if any
-const sal_uInt16 nMinCount = std::min( nColors, rPal.GetEntryCount() );
+const sal_uInt16 nMinCount = min( nColors, rPal.GetEntryCount() );
if( nMinCount )
memcpy( pBI->bmiColors, rPal.ImplGetColorBuffer(), nMinCount *
sizeof(RGBQUAD) );
}
@@ -964,7 +964,7 @@ void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer,
bool bReadOnly )
PBITMAPINFO pBI = (PBITMAPINFO) GlobalLock( mhDIB );
const sal_uInt16nCount =
pBuffer->maPalette.GetEntryCount();
const sal_uInt16nDIBColorCount = ImplGetDIBColorCount(
mhDIB );
-memcpy( pBI->bmiColors,
pBuffer->maPalette.ImplGetColorBuffer(), std::min( nDIBColorCount, nCount ) *
sizeof( RGBQUAD ) );
+memcpy( pBI->bmiColors,
pBuffer->maPalette.ImplGetColorBuffer(), min( nDIBColorCount, nCount ) *
sizeof( RGBQUAD ) );
GlobalUnlock( mhDIB );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svgio/source
svgio/source/svgreader/svgnode.cxx | 33 -
1 file changed, 32 insertions(+), 1 deletion(-)
New commits:
commit 86d121eb3d832d88d3da380ab07bb506f687ddc6
Author: Armin Le Grand
Date: Fri Jun 14 17:06:00 2013 +
Resolves: #i122522# apply needed order to CSS styles to presentation styles
(cherry picked from commit 2610028a8a1465006059c504a5230b67f550406c)
Conflicts:
svgio/source/svgreader/svgnode.cxx
Change-Id: If1f4184da76b275e44737d5f16a3cb57357db67d
diff --git a/svgio/source/svgreader/svgnode.cxx
b/svgio/source/svgreader/svgnode.cxx
index 8e95546..c4cc265 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -179,12 +179,43 @@ namespace svgio
void SvgNode::parseAttributes(const com::sun::star::uno::Reference<
com::sun::star::xml::sax::XAttributeList >& xAttribs)
{
const sal_uInt32 nAttributes(xAttribs->getLength());
+// #i122522# SVG defines that 'In general, this means that the
presentation attributes have
+// lower priority than other CSS style rules specified in author
style sheets or style
+// attributes.' in
http://www.w3.org/TR/SVG/styling.html#UsingPresentationAttributes
+// (6.4 Specifying properties using the presentation attributes
SVG 1.1). That means that
+// e.g. font-size will appear as presentation attribute and CSS
style attribute. In these
+// cases, CSS style attributes need to have precedence. To do so
it is possible to create
+// a proirity system for all properties of a shape, but it will
also work to parse the
+// presentation attributes of type 'style' last, so they will
overwrite the less-prioritized
+// already interpreted ones. Thus, remember SVGTokenStyle entries
and parse them last.
+// To make this work it is required that parseAttribute is only
called by parseAttributes
+// which is the case.
+std::vector< sal_uInt32 > aSVGTokenStyleIndexes;
for(sal_uInt32 a(0); a < nAttributes; a++)
{
const OUString aTokenName(xAttribs->getNameByIndex(a));
+const SVGToken aSVGToken(StrToSVGToken(aTokenName));
-parseAttribute(aTokenName, StrToSVGToken(aTokenName),
xAttribs->getValueByIndex(a));
+if(SVGTokenStyle == aSVGToken)
+{
+// #i122522# remember SVGTokenStyle entry
+aSVGTokenStyleIndexes.push_back(a);
+}
+else
+{
+parseAttribute(aTokenName, StrToSVGToken(aTokenName),
xAttribs->getValueByIndex(a));
+}
+}
+
+// #i122522# parse SVGTokenStyle entries last to override already
interpreted
+// 'presentation attributes' of potenially the same type
+for(sal_uInt32 b(0); b < aSVGTokenStyleIndexes.size(); b++)
+{
+const sal_uInt32 nSVGTokenStyleIndex(aSVGTokenStyleIndexes[b]);
+const ::rtl::OUString
aTokenName(xAttribs->getNameByIndex(nSVGTokenStyleIndex));
+
+parseAttribute(aTokenName, SVGTokenStyle,
xAttribs->getValueByIndex(nSVGTokenStyleIndex));
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 26/10028a8a1465006059c504a5230b67f550406c
26/10028a8a1465006059c504a5230b67f550406c |1 + 1 file changed, 1 insertion(+) New commits: commit f43d2a1b356d733457017ad09d556992c41b0d63 Author: Caolán McNamara Date: Fri Jun 14 20:11:10 2013 +0100 Notes added by 'git notes add' diff --git a/26/10028a8a1465006059c504a5230b67f550406c b/26/10028a8a1465006059c504a5230b67f550406c new file mode 100644 index 000..d411ad5 --- /dev/null +++ b/26/10028a8a1465006059c504a5230b67f550406c @@ -0,0 +1 @@ +merged as: 86d121eb3d832d88d3da380ab07bb506f687ddc6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC] Impress Remote Protocol
Hi, On 13/06/13 19:32, Artur Dryomov wrote: > Hi All, > > I have created a wiki page where I moved some information from Git and > placed some thoughts about the Impress remote protocol. > > https://wiki.documentfoundation.org/Impress_Remote_Protocol > > It would be really great if Andrzej could improve the information > about the first version of protocol. > Probably there are other commands --- like pairing ones --- that are > missed. But I can be wrong :-) Looks correct, although I've not looked at this in a while so I might be forgetting some details. The definitive resources however are sd/source/ui/remotecontrol/Receiver.cxx & android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java which are both fairly small/simple. > > This page contains my proposal of the second version of protocol as well. > It would be interesting to see other proposals and hear thoughts and > opinions. We actually did originally use JSON last year, but moved to a text based protocol to avoid having to deal with additional libraries and to reduce overhead, (although I'm not very well qualified to judge the relative merits of each). The main issue is making sure that the protocol is usable on all the necessary platforms. No idea how easy it is to use JSON or XML with iOS, Android seems to have good support for JSON but no idea about XML, Firefox OS (javascript) has great JSON support and shouldn't be too hard to use XML either -- in any case plaintext is still the easiest to parse. (I can't remember what library I used within LO for json anymore -- it might have been json-glib -- but any additional libraries mean extra work with integrating them into the LO since I was using an external library.) I don't see any real need to switch from plain text though -- the commands are very simple (as most 3 parameters per command), i.e. easier to parse directly than through another layer. Extending the current protocol avoids having to do any special work to keep backwards compatibility (e.g. any unrecognised commands will simply be ignored by older clients at the moment). Adding another layer looks like it'll just make the code more complicated without any benefit. It's even been suggested to go the other way and use a binary protocol (although that won't play well with the Firefox OS remote since Javascript doesn't like binary). A versioning/handshake system would still be useful though so that clients and servers know what features are supported, especially w.r.t. to knowing whether the laser pointer can be used / slide previews & notes have to be actively fetched / etc. > I'll read Google Play reviews soon to find out new feature requests. > BTW --- is it possible to get the access to the Android developer console? > Google Play shows reviews for a current language only, the developer > console can show all reviews at once. No idea -- I'm not entirely certain who controls the TDF Play account. I think the two main ideas being floated though were adding a "laser-pointer" and storage of presentations on the phone (i.e. as a usb-stick/web/etc. replacement). Also one thing I did look at but didn't get very far with was sending fully formatted presentation notes -- at the moment they are unformatted (except for newlines) -- the necessary logic to output html notes is already in the export filters but would need adapting to output the notes for a single slide. ATB, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LO / Firebird DB Integration
Hi all, Brief update: I now have Firebird (2.5) building within LibreOffice -- only tested on Suse x64 -- I've still not sorted out all the installation details yet though so no idea how things will run in practice (should be fairly simple based on http://www.firebirdfaq.org/Firebird-Embedded-Linux-HOWTO.html ), I'll start on that once I have Windows happy. The Windows build looks like it'll be somewhat tricky, running configure fails at the moment with configure: error: unsupported platform i686-pc-cygwin According to the instructions at http://www.firebirdsql.org/en/building-the-code/ you are supposed to just run three .bat scripts, but I'm not sure how well that'll integrate with the rest of the LO build system -- I'll update once I understand more. Cheers, Andrzej On 10/06/13 09:49, Michael Meeks wrote: > On Sun, 2013-06-09 at 20:10 +0100, Andrzej J. R. Hunt wrote: >> Now :) (exams just finished). > Nice - summer is almost beginning :-) > >> I'm working on getting the internal >> firebird working at the moment (see above) since at the moment that >> breaks my build (If I've understood correctly then at the moment this >> works only with an external firebird?). (I've managed to fix the build >> breaking when firebird is disabled so far, that's stuck in my git-stash >> for the moment though.) If no-one else is currently doing this I could >> concentrate on the building/integration of firebird within LO? (Once I >> have it working on Linux there'll probably be more fun to have with >> getting it to cooperate with Windows/Mac.) > Sounds like a good plan to me; I don't believe Igalia are so interested > in that use-case (being focused on a linux/distro build scenario) :-) > >> W.r.t. migration -- I assume that ultimately we'd want a C++ parser that >> can convert an HSQLDB database into any other database? (I've started >> some light digging through the HSQLDB code to see how it works / how to >> parse their file format.) > I sent you some code ptrs from my own research in the past there in a > separate mail :-) > > Thanks Andrzej ! > > Michael. > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svgio/source
svgio/source/svgreader/svgnode.cxx | 33 -
1 file changed, 32 insertions(+), 1 deletion(-)
New commits:
commit 2610028a8a1465006059c504a5230b67f550406c
Author: Armin Le Grand
Date: Fri Jun 14 17:06:00 2013 +
i122522 apply needed order to CSS styles to presentation styles
diff --git a/svgio/source/svgreader/svgnode.cxx
b/svgio/source/svgreader/svgnode.cxx
index 4a6f266..438d3c3 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -185,12 +185,43 @@ namespace svgio
void SvgNode::parseAttributes(const com::sun::star::uno::Reference<
com::sun::star::xml::sax::XAttributeList >& xAttribs)
{
const sal_uInt32 nAttributes(xAttribs->getLength());
+// #122522# SVG defines that 'In general, this means that the
presentation attributes have
+// lower priority than other CSS style rules specified in author
style sheets or style
+// attributes.' in
http://www.w3.org/TR/SVG/styling.html#UsingPresentationAttributes
+// (6.4 Specifying properties using the presentation attributes
SVG 1.1). That means that
+// e.g. font-size will appear as presentation attribute and CSS
style attribute. In these
+// cases, CSS style attributes need to have precedence. To do so
it is possible to create
+// a proirity system for all properties of a shape, but it will
also work to parse the
+// presentation attributes of type 'style' last, so they will
overwrite the less-prioritized
+// already interpreted ones. Thus, remember SVGTokenStyle entries
and parse them last.
+// To make this work it is required that parseAttribute is only
called by parseAttributes
+// which is the case.
+std::vector< sal_uInt32 > aSVGTokenStyleIndexes;
for(sal_uInt32 a(0); a < nAttributes; a++)
{
const ::rtl::OUString aTokenName(xAttribs->getNameByIndex(a));
+const SVGToken aSVGToken(StrToSVGToken(aTokenName));
-parseAttribute(aTokenName, StrToSVGToken(aTokenName),
xAttribs->getValueByIndex(a));
+if(SVGTokenStyle == aSVGToken)
+{
+// #122522# remember SVGTokenStyle entry
+aSVGTokenStyleIndexes.push_back(a);
+}
+else
+{
+parseAttribute(aTokenName, StrToSVGToken(aTokenName),
xAttribs->getValueByIndex(a));
+}
+}
+
+// #122522# parse SVGTokenStyle entries last to override already
interpreted
+// 'presentation attributes' of potenially the same type
+for(sal_uInt32 b(0); b < aSVGTokenStyleIndexes.size(); b++)
+{
+const sal_uInt32 nSVGTokenStyleIndex(aSVGTokenStyleIndexes[b]);
+const ::rtl::OUString
aTokenName(xAttribs->getNameByIndex(nSVGTokenStyleIndex));
+
+parseAttribute(aTokenName, SVGTokenStyle,
xAttribs->getValueByIndex(nSVGTokenStyleIndex));
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Get rid of SalLayout::GetFallbackFontData()
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4285
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/4285/1
Get rid of SalLayout::GetFallbackFontData()
This is only used in conjunction with SalLayout::GetNextGlyphs() in
vcl/source/gdi/pdfwriter_impl.cxx to retrieve the fallback font, if any,
used to layout the given glyph, but it is a very convoluted way to do a
straight forward thing, and hard to adapt for new SalLayout
implementations.
So now I just pass a fallback fonts array, when requested, in
GetNextGlyphs() itself.
Change-Id: I24e7931f64867a4fb4e7b728c65faa6198e24aba
---
M vcl/aqua/source/gdi/atsui/salatslayout.cxx
M vcl/coretext/ctlayout.cxx
M vcl/inc/graphite_layout.hxx
M vcl/inc/graphite_serverfont.hxx
M vcl/inc/sallayout.hxx
M vcl/source/gdi/pdfwriter_impl.cxx
M vcl/source/gdi/sallayout.cxx
M vcl/source/glyphs/graphite_layout.cxx
M vcl/win/source/gdi/winlayout.cxx
9 files changed, 43 insertions(+), 77 deletions(-)
diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
index 1b9776e..fd080f6 100644
--- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
@@ -56,8 +56,6 @@
virtual voidGetCaretPositions( int nArraySize, sal_Int32* pCaretXArray
) const;
virtual boolGetBoundRect( SalGraphics&, Rectangle& ) const;
-const PhysicalFontFace* GetFallbackFontData( sal_GlyphId ) const;
-
virtual voidInitFont() const;
virtual voidMoveGlyph( int nStart, long nNewXPos );
virtual voidDropGlyph( int nStart );
@@ -505,7 +503,8 @@
* @return : number of glyph details that were provided
**/
int ATSLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIDs, Point& rPos,
int& nStart,
-sal_Int32* pGlyphAdvances, int* pCharIndexes ) const
+sal_Int32* pGlyphAdvances, int* pCharIndexes,
+const PhysicalFontFace** pFallbackFonts ) const
{
if( nStart < 0 )// first glyph requested?
nStart = 0;
@@ -582,6 +581,9 @@
const int nLevel = mpFallbackInfo->AddFallback( nFallbackFontID );
// update sal_GlyphId with fallback level
nGlyphId |= (nLevel << GF_FONTSHIFT);
+
+if( pFallbackFonts )
+*(pFallbackFonts++) = mpFallbackInfo->GetFallbackFontData(
nLevel );
}
// update resulting glyphid array
@@ -1183,20 +1185,6 @@
void ATSLayout::MoveGlyph( int /*nStart*/, long /*nNewXPos*/ ) {}
void ATSLayout::DropGlyph( int /*nStart*/ ) {}
void ATSLayout::Simplify( bool /*bIsBase*/ ) {}
-
-// get the PhysicalFontFace for a glyph fallback font
-// for a glyphid that was returned by ATSLayout::GetNextGlyphs()
-const PhysicalFontFace* ATSLayout::GetFallbackFontData( sal_GlyphId nGlyphId )
const
-{
-// check if any fallback fonts were needed
-if( !mpFallbackInfo )
-return NULL;
-// check if the current glyph needs a fallback font
-int nFallbackLevel = (nGlyphId & GF_FONTMASK) >> GF_FONTSHIFT;
-if( !nFallbackLevel )
-return NULL;
-return mpFallbackInfo->GetFallbackFontData( nFallbackLevel );
-}
// ===
diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index a5915d9..89ecf09 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -35,7 +35,8 @@
virtual voidDrawText( SalGraphics& ) const;
virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point&
rPos, int&,
-sal_Int32* pGlyphAdvances, int* pCharIndexes ) const;
+sal_Int32* pGlyphAdvances, int* pCharIndexes,
+const PhysicalFontFace** pFallbackFonts ) const;
virtual longGetTextWidth() const;
virtual longFillDXArray( sal_Int32* pDXArray ) const;
@@ -43,8 +44,6 @@
virtual voidGetCaretPositions( int nArraySize, sal_Int32* pCaretXArray
) const;
virtual boolGetGlyphOutlines( SalGraphics&, PolyPolyVector& ) const;
virtual boolGetBoundRect( SalGraphics&, Rectangle& ) const;
-
-const PhysicalFontFace* GetFallbackFontData( sal_GlyphId ) const;
virtual voidInitFont( void) const;
virtual voidMoveGlyph( int nStart, long nNewXPos );
@@ -224,7 +223,8 @@
// ---
int CTLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIDs, Point& rPos,
int& nStart,
-sal_Int32* pGlyphAdvances, int* pCharIndexes ) const
+sal_Int32* pGlyphAdvances, int* pCharIndexes,
+const PhysicalFontFace** pFallbackFonts ) const
{
if( !mpCTLine )
return 0;
@@ -293,6 +293,8 @@
}
}
+const PhysicalFontFace* pFallbackFont = NULL;
+
// get the details for each interesting glyph
// TODO: handle nLen>1
for(; (--nLen >= 0) && (nSubInde
[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc' - download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a2a5539bfaf0170d9298495dc88896ffe801248a Author: Andrzej J.R. Hunt Date: Fri Jun 14 18:19:07 2013 +0100 Fix incorrect Firebird checksum. Change-Id: Ic636613b03afe572140d6fe28793dd65ed775f26 diff --git a/download.lst b/download.lst index e2aed9a..7c4bc0c 100644 --- a/download.lst +++ b/download.lst @@ -6,7 +6,7 @@ MWAW_MD5SUM := 2090daf6e8a27b52e8c5f26c915bd7c5 export MWAW_TARBALL := libmwaw-0.1.9.tar.bz2 VISIO_MD5SUM := 05574c2ec54dd0c29d75cacdf9419f44 export VISIO_TARBALL := libvisio-0.0.28.tar.bz2 -FIREBIRD_MD5SUM := d41d8cd98f00b204e9800998ecf8427e +FIREBIRD_MD5SUM := 21154d2004e025c8a325b0357bb5 export FIREBIRD_TARBALL := Firebird-2.5.2.26540-0.tar.bz2 # FIREBIRD_MD5SUM := b259c2d1c60a03bd104108405ae990a7 # export FIREBIRD_TARBALL := Firebird-3.0-alpha1-20130302.tar.gz ___ 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 Bug 6 depends on bug 57176, which changed state. Bug 57176 Summary: EDITING: CONDITIONAL FORMATTING not restored by UNDO https://bugs.freedesktop.org/show_bug.cgi?id=57176 What|Removed |Added Status|RESOLVED|REOPENED Resolution|WORKSFORME |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/source lotuswordpro/source mysqlc/source
chart2/source/tools/PropertyHelper.cxx |2 +-
lotuswordpro/source/filter/lwpfribmark.cxx |2 +-
mysqlc/source/mysqlc_resultset.cxx | 12 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 8a8b1ae3e9c1d782bf1cf170f5498992a4f680fe
Author: Stephan Bergmann
Date: Fri Jun 14 18:18:37 2013 +0200
Some more toInt32 clean up
Change-Id: I4f7911cb283d67e7c7b883d629b39588e96f32c2
diff --git a/chart2/source/tools/PropertyHelper.cxx
b/chart2/source/tools/PropertyHelper.cxx
index fb6b0bf..6bbd339 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -86,7 +86,7 @@ struct lcl_OUStringRestToInt32 : public
::std::unary_function< OUString, sal_Int
{
if( m_nPrefixLength > rStr.getLength() )
return 0;
-return rStr.copy( m_nPrefixLength ).toInt32( 10 /* radix */ );
+return rStr.copy( m_nPrefixLength ).toInt32();
}
private:
sal_Int32 m_nPrefixLength;
diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx
b/lotuswordpro/source/filter/lwpfribmark.cxx
index 5c293eb..79498b7 100644
--- a/lotuswordpro/source/filter/lwpfribmark.cxx
+++ b/lotuswordpro/source/filter/lwpfribmark.cxx
@@ -318,7 +318,7 @@ void LwpFribField::XFConvert(XFContentContainer* pXFPara)
XFEntry* pEntry = new XFEntry;
pEntry->SetEntryType(enumXFEntryTOC);
pEntry->SetStringValue(sText);
-pEntry->SetOutlineLevel(sLevel.toInt32(10));
+pEntry->SetOutlineLevel(sLevel.toInt32());
pXFPara->Add(pEntry);
}
}
diff --git a/mysqlc/source/mysqlc_resultset.cxx
b/mysqlc/source/mysqlc_resultset.cxx
index b0bd528..b2793ad 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -291,13 +291,13 @@ Date SAL_CALL OResultSet::getDate(sal_Int32 column)
token = dateString.getToken (0, '-', nIndex);
switch (i) {
case 0:
-d.Year = static_cast(token.toInt32(10));
+d.Year = static_cast(token.toUInt32());
break;
case 1:
-d.Month = static_cast(token.toInt32(10));
+d.Month = static_cast(token.toUInt32());
break;
case 2:
-d.Day = static_cast(token.toInt32(10));
+d.Day = static_cast(token.toUInt32());
break;
default:;
}
@@ -566,13 +566,13 @@ Time SAL_CALL OResultSet::getTime(sal_Int32 column)
token = timeString.getToken (0, ':', nIndex);
switch (i) {
case 0:
-t.Hours = static_cast(token.toInt32(10));
+t.Hours = static_cast(token.toUInt32());
break;
case 1:
-t.Minutes = static_cast(token.toInt32(10));
+t.Minutes = static_cast(token.toUInt32());
break;
case 2:
-t.Seconds = static_cast(token.toInt32(10));
+t.Seconds = static_cast(token.toUInt32());
break;
}
i++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/gdi/salbmp.cxx |9 + 1 file changed, 9 insertions(+) New commits: commit 5a0781a213c944900c5b84d3733c0b71934f817f Author: Caolán McNamara Date: Fri Jun 14 17:26:18 2013 +0100 min/max foo for msvc Change-Id: Icdb19eb9f8e3925f2da2d2ffe514f0da2bd14471 diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index af09b16..72bc268 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -32,6 +32,15 @@ #include #if defined _MSC_VER +#ifndef min +#define min(a,b)(((a) < (b)) ? (a) : (b)) +#endif +#ifndef max +#define max(a,b)(((a) > (b)) ? (a) : (b)) +#endif +#endif + +#if defined _MSC_VER #pragma warning(push, 1) #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 19/4c7ff906c9164a522f924dc1c1f8c5fc81b6e6
19/4c7ff906c9164a522f924dc1c1f8c5fc81b6e6 |1 + 1 file changed, 1 insertion(+) New commits: commit 6428a5e31c346eed53b096615ddb00696b22f473 Author: Caolán McNamara Date: Fri Jun 14 17:23:07 2013 +0100 Notes added by 'git notes add' diff --git a/19/4c7ff906c9164a522f924dc1c1f8c5fc81b6e6 b/19/4c7ff906c9164a522f924dc1c1f8c5fc81b6e6 new file mode 100644 index 000..4feac02 --- /dev/null +++ b/19/4c7ff906c9164a522f924dc1c1f8c5fc81b6e6 @@ -0,0 +1 @@ +merged as: ff422b8b153289143d16857890cbe3c0b411cd54 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx |6 +-
drawinglayer/source/processor2d/vclprocessor2d.cxx |7 ++-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit ff422b8b153289143d16857890cbe3c0b411cd54
Author: Herbert Dürr
Date: Thu Jan 24 16:55:41 2013 +
Related: #i121534# avoid expensive emulation of 1bit masks for Mac's Quartz
(cherry picked from commit 194c7ff906c9164a522f924dc1c1f8c5fc81b6e6)
Change-Id: I28a31c5abb14ceb72dc290e6ed2161c0ef6592df
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index ee51ea0..99a1ff7 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -179,7 +179,11 @@ namespace
// create BitmapEx
Bitmap aMainBitmap = aVirtualDevice.GetBitmap(Point(),
aVirtualDevice.GetOutputSizePixel());
-Bitmap aMaskBitmap = aVirtualDeviceMask.GetBitmap(Point(),
aVirtualDeviceMask.GetOutputSizePixel());
+#if defined(MACOSX)
+AlphaMask aMaskBitmap( aVirtualDeviceMask.GetBitmap( Point(),
aVirtualDeviceMask.GetOutputSizePixel()));
+#else
+Bitmap aMaskBitmap = aVirtualDeviceMask.GetBitmap( Point(),
aVirtualDeviceMask.GetOutputSizePixel());
+#endif
aNextStep.maBitmapEx = BitmapEx(aMainBitmap, aMaskBitmap);
// add to vector
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index a11c49b..56d56b7 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -464,7 +464,12 @@ namespace drawinglayer
{
// parts will be uncovered, extend aBitmapEx with a mask bitmap
const Bitmap aContent(aBitmapEx.GetBitmap());
-aBitmapEx = BitmapEx(aContent, Bitmap(aContent.GetSizePixel(),
1));
+#if defined(MACOSX)
+const AlphaMask aMaskBmp( aContent.GetSizePixel());
+#else
+const Bitmap aMaskBmp( aContent.GetSizePixel(), 1);
+#endif
+aBitmapEx = BitmapEx(aContent, aMaskBmp);
}
// draw using OutputDevice'sDrawTransformedBitmapEx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/aqua
vcl/aqua/source/gdi/salgdicommon.cxx | 47 +--
1 file changed, 39 insertions(+), 8 deletions(-)
New commits:
commit 9b4c604e1eb790d7f86097653d6ae4f19bd6fe14
Author: Herbert Dürr
Date: Wed Jan 23 14:58:58 2013 +
Related: #i121534# support native drawing of affinely-transformed images...
on Mac
(cherry picked from commit 947f7594c18a01eb070fac3b01d48d22f6bfb040)
Conflicts:
vcl/aqua/source/gdi/salgdi.cxx
Change-Id: I7e38ed34caf4f0e841f95ef5c4de52e241d561db
diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx
b/vcl/aqua/source/gdi/salgdicommon.cxx
index a7b3f32..e756168 100644
--- a/vcl/aqua/source/gdi/salgdicommon.cxx
+++ b/vcl/aqua/source/gdi/salgdicommon.cxx
@@ -531,15 +531,46 @@ bool AquaSalGraphics::drawAlphaBitmap( const SalTwoRect&
rTR,
}
bool AquaSalGraphics::drawTransformedBitmap(
-const basegfx::B2DPoint& rNull,
-const basegfx::B2DPoint& rX,
-const basegfx::B2DPoint& rY,
-const SalBitmap& rSourceBitmap,
-const SalBitmap* pAlphaBitmap)
+const basegfx::B2DPoint& rNull, const basegfx::B2DPoint& rX, const
basegfx::B2DPoint& rY,
+const SalBitmap& rSrcBitmap, const SalBitmap* pAlphaBmp )
{
-// here direct support for transformed bitmaps can be impemented
-(void)rNull; (void)rX; (void)rY; (void)rSourceBitmap; (void)pAlphaBitmap;
-return false;
+if( !CheckContext() )
+return true;
+
+// get the Quartz image
+CGImageRef xImage = NULL;
+const Size aSize = rSrcBitmap.GetSize();
+const QuartzSalBitmap& rSrcSalBmp = static_cast(rSrcBitmap);
+const QuartzSalBitmap* pMaskSalBmp = static_cast(pAlphaBmp);
+if( !pMaskSalBmp)
+xImage = rSrcSalBmp.CreateCroppedImage( 0, 0, (int)aSize.Width(),
(int)aSize.Height() );
+else
+xImage = rSrcSalBmp.CreateWithMask( *pMaskSalBmp, 0, 0,
(int)aSize.Width(), (int)aSize.Height() );
+if( !xImage )
+return false;
+
+// setup the image transformation
+// using the rNull,rX,rY points as destinations for the
(0,0),(0,Width),(Height,0) source points
+CGContextSaveGState( mrContext );
+const basegfx::B2DVector aXRel = rX - rNull;
+const basegfx::B2DVector aYRel = rY - rNull;
+const CGAffineTransform aCGMat = CGAffineTransformMake(
+aXRel.getX()/aSize.Width(), aXRel.getY()/aSize.Width(),
+aYRel.getX()/aSize.Height(), aYRel.getY()/aSize.Height(),
+rNull.getX(), rNull.getY());
+CGContextConcatCTM( mrContext, aCGMat );
+
+// draw the transformed image
+const CGRect aSrcRect = {{0,0}, {static_cast(aSize.Width()),
static_cast(aSize.Height())}};
+CGContextDrawImage( mrContext, aSrcRect, xImage );
+CGImageRelease( xImage );
+// restore the Quartz graphics state
+CGContextRestoreGState(mrContext);
+
+// mark the destination as painted
+const CGRect aDstRect = CGRectApplyAffineTransform( aSrcRect, aCGMat );
+RefreshRect( aDstRect );
+return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 94/7f7594c18a01eb070fac3b01d48d22f6bfb040
94/7f7594c18a01eb070fac3b01d48d22f6bfb040 |1 + 1 file changed, 1 insertion(+) New commits: commit 8132d2563a9d887374472e3d6cd9818c396f077d Author: Caolán McNamara Date: Fri Jun 14 17:21:04 2013 +0100 Notes added by 'git notes add' diff --git a/94/7f7594c18a01eb070fac3b01d48d22f6bfb040 b/94/7f7594c18a01eb070fac3b01d48d22f6bfb040 new file mode 100644 index 000..614b2e1 --- /dev/null +++ b/94/7f7594c18a01eb070fac3b01d48d22f6bfb040 @@ -0,0 +1 @@ +merged as: 9b4c604e1eb790d7f86097653d6ae4f19bd6fe14 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Please hold off modifying sc in the next few weeks
Hi all, On Fri, Jun 14, 2013 at 06:12:16PM +0200, Bjoern Michaelsen wrote: > just in private: whoops! Ok, that was not so private, but the argument stands: obviously we dont want the raise such restrictions too often. Best, Bjoern (who likely will join the next ESC-call with a red clown nose or something) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ee/ba25ef43bb4ec175b16118b3b4c62f50f40ed5
ee/ba25ef43bb4ec175b16118b3b4c62f50f40ed5 |1 + 1 file changed, 1 insertion(+) New commits: commit c9f5bfd3161690cf19b813cdca009977701e043e Author: Caolán McNamara Date: Fri Jun 14 17:15:43 2013 +0100 Notes added by 'git notes add' diff --git a/ee/ba25ef43bb4ec175b16118b3b4c62f50f40ed5 b/ee/ba25ef43bb4ec175b16118b3b4c62f50f40ed5 new file mode 100644 index 000..f776a52 --- /dev/null +++ b/ee/ba25ef43bb4ec175b16118b3b4c62f50f40ed5 @@ -0,0 +1 @@ +merged as: f1f6ac03aa41efce53d08ac16dc33f6f6bb3e8a7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/gdi/salgdi.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit f1f6ac03aa41efce53d08ac16dc33f6f6bb3e8a7 Author: Armin Le Grand Date: Fri Jun 14 14:10:48 2013 + Resolves: #i122456# Corrected tessellation for fat lines (cherry picked from commit eeba25ef43bb4ec175b16118b3b4c62f50f40ed5) Change-Id: Ic482dd1230793d505abd2d0551cb527ca5c816f6 diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index e024349..eacd35b 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -1163,7 +1163,10 @@ bool X11SalGraphics::drawPolyLine( // #i11575#desc5#b adjust B2D tesselation result to raster positions basegfx::B2DPolygon aPolygon = rPolygon; const double fHalfWidth = 0.5 * rLineWidth.getX(); -aPolygon.transform( basegfx::tools::createTranslateB2DHomMatrix(+fHalfWidth,+fHalfWidth) ); + +// #i122456# This is probably thought to happen to align hairlines to pixel positions, so +// it should be a 0.5 translation, not more. It will definitely go wrong with fat lines +aPolygon.transform( basegfx::tools::createTranslateB2DHomMatrix(0.5, 0.5) ); // shortcut for hairline drawing to improve performance bool bDrawnOk = true; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Please hold off modifying sc in the next few weeks
Hi Kohei, On Fri, Jun 14, 2013 at 09:29:56AM -0400, Kohei Yoshida wrote: > I'm in the middle of a huge (I mean huge) refactoring in Calc core, > ... just in private: I have no objection for you to have some exclusivity on a part of sc/ -- I know you know your stuff. But the way this came up on the ML makes it quite likely for others to come up with "I want to have sw/whatever exclusivity" at some point and the discussion why that is ok for Kohei to have but not for Random C. Hacker is something Id rather not have. All the best for your refactoring, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Cppcheck: uselessAssignmentPtrArg in wrapper.cxx (sdext module)
On Thu, 2013-05-16 at 22:23 +0200, Julien Nabet wrote: > Any idea for initial post (sdext/source/pdfimport/wrapper/wrapper.cxx, > line 475) ? Well, this code was a refactor that happened in 16fcdbceedcdbf77e07da780581df83f38305dbd and its definitely wrong in one way or the other. Either the pCopy += l; should be removed, *or* the pCopy should be effectively const sal_Unicode& *pCopy, i.e. that changes to the pCopy affect the original pCopy passed in. I rather think that code is supposed to skip over the full token of e.g. "Italic" etc once it has found that token and set the italic bit on so that a font name of "FOO-ItalicBold" turns into a font name of FOO with the italic and bold bits set and without parsing e.g. the chunk "talic" once its been determined to be part of Italic, pushed code to do that now as http://cgit.freedesktop.org/libreoffice/core/commit/?id=4c8aa30155ef9ec9ab00b5d674bddc2b4929887a. Hopefully without breaking something. C ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/wrapper/wrapper.cxx | 124 +++--
1 file changed, 85 insertions(+), 39 deletions(-)
New commits:
commit 4c8aa30155ef9ec9ab00b5d674bddc2b4929887a
Author: Caolán McNamara
Date: Fri Jun 14 16:47:16 2013 +0100
advance over font token during font name parsing
Change-Id: I457a4cae7907df6fc05535873ed51766c56220ee
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx
b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 35766d4..d091d6b 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -169,10 +169,11 @@ class Parser
void readLink();
void readMaskedImage();
void readSoftMaskedImage();
-int parseFontCheckForString( const sal_Unicode* pCopy, const
char* str, sal_Int32& nLen,
-FontAttributes& aResult, bool bItalic, bool bBold);
-int parseFontRemoveSuffix( const sal_Unicode* pCopy, const char*
s, sal_Int32& nLen);
-
+sal_Int32 parseFontCheckForString(const sal_Unicode* pCopy, sal_Int32
nCopyLen,
+ const char* pAttrib, sal_Int32
nAttribLen,
+ FontAttributes& rResult, bool bItalic,
bool bBold);
+sal_Int32 parseFontRemoveSuffix(const sal_Unicode* pCopy, sal_Int32
nCopyLen,
+ const char* pAttrib, sal_Int32 nAttribLen);
public:
Parser( const ContentSinkSharedPtr& rSink,
@@ -459,41 +460,40 @@ rendering::ARGBColor Parser::readColor()
return aRes;
}
-int Parser::parseFontCheckForString( const sal_Unicode* pCopy, const char* s,
sal_Int32& nLen,
-FontAttributes& aResult, bool bItalic, bool bBold)
+sal_Int32 Parser::parseFontCheckForString(
+const sal_Unicode* pCopy, sal_Int32 nCopyLen,
+const char* pAttrib, sal_Int32 nAttribLen,
+FontAttributes& rResult, bool bItalic, bool bBold)
{
-int l = strlen(s);
-if (nLen < l)
+if (nCopyLen < nAttribLen)
return 0;
-for (int i = 0; i < l; i++)
-if (tolower(pCopy[i]) != s[i]
-&& toupper(pCopy[i]) != s[i])
+for (sal_Int32 i = 0; i < nAttribLen; ++i)
+if (tolower(pCopy[i]) != pAttrib[i]
+&& toupper(pCopy[i]) != pAttrib[i])
return 0;
-aResult.isItalic = bItalic;
-aResult.isBold = bBold;
-nLen -= l;
-pCopy += l;
-return l;
+rResult.isItalic = bItalic;
+rResult.isBold = bBold;
+return nAttribLen;
}
-int Parser::parseFontRemoveSuffix( const sal_Unicode* pCopy, const char* s,
sal_Int32& nLen)
+sal_Int32 Parser::parseFontRemoveSuffix(
+const sal_Unicode* pCopy, sal_Int32 nCopyLen,
+const char* pAttrib, sal_Int32 nAttribLen)
{
-int l = strlen(s);
-if (nLen < l)
+if (nCopyLen < nAttribLen)
return 0;
-for (int i = 0; i < l; i++)
-if ( pCopy[nLen - l + i] != s[i] )
+for (sal_Int32 i = 0; i < nAttribLen; ++i)
+if ( pCopy[nCopyLen - nAttribLen + i] != pAttrib[i] )
return 0;
-nLen -= l;
-return l;
+return nAttribLen;
}
-void Parser::parseFontFamilyName( FontAttributes& aResult )
+void Parser::parseFontFamilyName( FontAttributes& rResult )
{
-OUStringBuffer aNewFamilyName( aResult.familyName.getLength() );
+OUStringBuffer aNewFamilyName( rResult.familyName.getLength() );
-const sal_Unicode* pCopy = aResult.familyName.getStr();
-sal_Int32 nLen = aResult.familyName.getLength();
+const sal_Unicode* pCopy = rResult.familyName.getStr();
+sal_Int32 nLen = rResult.familyName.getLength();
// parse out truetype subsets (e.g. BA+Thorndale)
if( nLen > 8 && pCopy[6] == sal_Unicode('+') )
{
@@ -503,17 +503,63 @@ void Parser::parseFontFamilyName( FontAttributes& aResult
)
while( nLen )
{
-if (parseFontRemoveSuffix( pCopy, "PSMT", nLen)) {}
-else if (parseFontRemoveSuffix( pCopy, "MT", nLen)) {}
-
-if (parseFontCheckForString( pCopy, "Italic", nLen, aResult, true, false))
{}
-else if (parseFontCheckForString( pCopy, "-Bold", nLen, aResult, false,
true)) {}
-else if (parseFontCheckForString( pCopy, "Bold", nLen, aResult, false,
true)) {}
-else if (parseFontCheckForString( pCopy, "-Roman", nLen, aResult, false,
false)) {}
-else if (parseFontCheckForString( pCopy, "-LightOblique", nLen, aResult,
true, false)) {}
-else if (parseFontCheckForString( pCopy, "-BoldOblique", nLen, aResult,
true, true)) {}
-else if (parseFontCheckForString( pCopy, "-Light", nLen, aResult, false,
false)) {}
-else if (parseFontCheckForString( pCopy, "-Reg", nLen, aResult, false,
false)) {}
+if (parseFontRemoveSuffix(pCopy, nLen,
RTL_CONSTASCII_STRINGPARAM("PSMT")))
+{
+nLen -= RTL_CONSTASCII_LENGTH("PSMT");
+}
+else if (parseFontRemoveSuffix(pCopy, nLen,
RTL_CONSTASCII_STRINGPARAM("MT")))
+
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/unx
vcl/unx/generic/gdi/salgdi.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit eeba25ef43bb4ec175b16118b3b4c62f50f40ed5 Author: Armin Le Grand Date: Fri Jun 14 14:10:48 2013 + i122456 Corrected tesellationing for fat lines diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index cda1c27..5bed5a8 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -1238,7 +1238,10 @@ bool X11SalGraphics::drawPolyLine( // #i11575#desc5#b adjust B2D tesselation result to raster positions basegfx::B2DPolygon aPolygon = rPolygon; const double fHalfWidth = 0.5 * rLineWidth.getX(); -aPolygon.transform( basegfx::tools::createTranslateB2DHomMatrix(+fHalfWidth,+fHalfWidth) ); + +// #122456# This is probably thought to happen to align hairlines to pixel positions, so +// it should be a 0.5 translation, not more. It will definitely go wrong with fat lines +aPolygon.transform( basegfx::tools::createTranslateB2DHomMatrix(0.5, 0.5) ); // shortcut for hairline drawing to improve performance bool bDrawnOk = true; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: menu question
Caolán McNamara wrote (14-06-13 17:25) Can you provide the full thing as a patch. A quick read through it suggest that it should have worked. Is here now: https://gerrit.libreoffice.org/4284 thanks, -- - Cor Nouws - http://nl.libreoffice.org - The Document Foundation Membership Committee Member ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#59427 first step for template menu
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4284 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/4284/1 fdo#59427 first step for template menu takes care for File > Template > Save and File > Template > Manage however the menu for the latter comes from uno:NewDoc and thus has to be changed > TODO Change-Id: I0600847724fc5ccb3ef13d57355d8eb54970cc9b --- M include/sfx2/sfxcommands.h M officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu M sc/uiconfig/scalc/menubar/menubar.xml M sd/uiconfig/sdraw/menubar/menubar.xml M sd/uiconfig/simpress/menubar/menubar.xml M sw/uiconfig/sglobal/menubar/menubar.xml M sw/uiconfig/sweb/menubar/menubar.xml M sw/uiconfig/swform/menubar/menubar.xml M sw/uiconfig/swreport/menubar/menubar.xml M sw/uiconfig/swriter/menubar/menubar.xml M sw/uiconfig/swxform/menubar/menubar.xml 11 files changed, 69 insertions(+), 9 deletions(-) diff --git a/include/sfx2/sfxcommands.h b/include/sfx2/sfxcommands.h index 3f4df5c..c7485cd 100644 --- a/include/sfx2/sfxcommands.h +++ b/include/sfx2/sfxcommands.h @@ -49,6 +49,7 @@ #define CMD_SID_CHECKIN ".uno:CheckIn" #define CMD_SID_OPENURL ".uno:OpenUrl" #define CMD_SID_OPTIONS ".uno:Options" +#define CMD_SID_TEMPLATE_MENU ".uno:TemplateMenu" #define CMD_SID_ORGANIZER ".uno:Organizer" #define CMD_SID_PASTE ".uno:Paste" #define CMD_SID_PASTE_SPECIAL ".uno:PasteSpecial" diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index bbed900..55a6872 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -5591,6 +5591,11 @@ Template Manager + + + ~Templates + + Edit with External Tool diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 777c324..199556ed 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -25,10 +25,16 @@ + + + + + + + - diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 0f2d312..c3021faf 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -25,10 +25,16 @@ + + + + + + + - diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 9ad2019..2fd3032 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -25,10 +25,16 @@ + + + + + + + - diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index 3c310f2..a72d86f 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -25,10 +25,16 @@ + + + + + + + - diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index 30229a7..3bec1a9 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -25,10 +25,16 @@ + + + + + + + - diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index 4f22cf1..5dde902 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -25,10 +25,16 @@ + + + + + + + - diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index 39284e8..5f57d46 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -25,10 +25,16 @@
[PATCH] Cleaning: remove use of old edt1 from dlg.h (Windows)
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4283
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/4283/1
Cleaning: remove use of old edt1 from dlg.h (Windows)
edt1 was used before cmb13 (used from Win2K version)
So use only cmb13 + tweaks associated comments
See
http://nabble.documentfoundation.org/Cppcheck-reassignment-of-edt1Id-because-isWin2000-has-been-removed-fpicker-module-td4061342.html
Change-Id: I9d56726508a9fbf2607c9d18b7b33eca340f1b9f
---
M fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index f672916..ee2760b 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -584,7 +584,7 @@
// Our approach is to align all static text controls with the
// static text control "File name" of the FileOpen dialog,
// all checkboxes and all list/comboboxes will be left aligned with
-// the standard combobox edt1 (defined in MS platform sdk dlgs.h)
+// the standard combobox cmb13 (defined in MS platform sdk dlgs.h)
// and all push buttons will be left aligned with the standard
// "OK" button
//-
@@ -689,8 +689,6 @@
HWND hFilterBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc2);
HWND hFileNameBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc3);
HWND hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, cmb13);
-if (!hFileNameBox)
-hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, edt1); // under Win98 it
is edt1 instead of cmb13
HWND hFilterBox = GetDlgItem(m_hwndFileOpenDlg, cmb1);
HWND hOkButton = GetDlgItem(m_hwndFileOpenDlg, IDOK);
@@ -985,15 +983,11 @@
// open dialog (reason: see above setDefaultName)
if (m_bInitialSelChanged && m_defaultName.getLength())
{
-sal_Int32 edt1Id = edt1;
-
-// under W2k the there is a combobox instead
+// from W2k there is a combobox instead
// of an edit field for the file name edit field
-// the control id of this box is cmb13 and not
-// edt1 as before so we must use this id
-edt1Id = cmb13;
-
-HWND hwndEdt1 = GetDlgItem(m_hwndFileOpenDlg, edt1Id);
+// So the control id of this box is cmb13 and not
+// edt1 as before
+HWND hwndEdt1 = GetDlgItem(m_hwndFileOpenDlg, cmb13);
SetWindowText(hwndEdt1,
reinterpret_cast(m_defaultName.getStr()));
}
--
To view, visit https://gerrit.libreoffice.org/4283
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d56726508a9fbf2607c9d18b7b33eca340f1b9f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a3/4f3fdf50dbf8eac0599dfb018fc0040ef2a2f0
a3/4f3fdf50dbf8eac0599dfb018fc0040ef2a2f0 |1 + 1 file changed, 1 insertion(+) New commits: commit d7a5f4a7e1a93b68a1d9d39017bf0ba838b68e17 Author: Caolán McNamara Date: Fri Jun 14 16:25:57 2013 +0100 Notes added by 'git notes add' diff --git a/a3/4f3fdf50dbf8eac0599dfb018fc0040ef2a2f0 b/a3/4f3fdf50dbf8eac0599dfb018fc0040ef2a2f0 new file mode 100644 index 000..6df8f8e --- /dev/null +++ b/a3/4f3fdf50dbf8eac0599dfb018fc0040ef2a2f0 @@ -0,0 +1 @@ +merged as: 9d491e73168cc21ed9f6fc7a596e8b4aec320a9b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/primitive2d/primitivetools2d.cxx |5 +++--
drawinglayer/source/processor2d/vclprocessor2d.cxx |6 --
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 9d491e73168cc21ed9f6fc7a596e8b4aec320a9b
Author: Armin Le Grand
Date: Fri Jun 14 12:02:40 2013 +
Resolves: #i122525# use X and Y for unit evaluation
(cherry picked from commit a34f3fdf50dbf8eac0599dfb018fc0040ef2a2f0)
Change-Id: Icdb83829917315173be5e824083ed502f6a6a8cb
diff --git a/drawinglayer/source/primitive2d/primitivetools2d.cxx
b/drawinglayer/source/primitive2d/primitivetools2d.cxx
index 063aa1c..f1998e7 100644
--- a/drawinglayer/source/primitive2d/primitivetools2d.cxx
+++ b/drawinglayer/source/primitive2d/primitivetools2d.cxx
@@ -31,8 +31,9 @@ namespace drawinglayer
{
::osl::MutexGuard aGuard( m_aMutex );
-// get the current DiscreteUnit
-const double
fDiscreteUnit((rViewInformation.getInverseObjectToViewTransformation() *
basegfx::B2DVector(1.0, 0.0)).getLength());
+// get the current DiscreteUnit, look at X and Y and use the
maximum
+const basegfx::B2DVector
aDiscreteVector(rViewInformation.getInverseObjectToViewTransformation() *
basegfx::B2DVector(1.0, 1.0));
+const double fDiscreteUnit(std::min(fabs(aDiscreteVector.getX()),
fabs(aDiscreteVector.getY(;
if(getBuffered2DDecomposition().hasElements() &&
!basegfx::fTools::equal(fDiscreteUnit, getDiscreteUnit()))
{
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 02b80cc..a11c49b 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -1396,7 +1396,8 @@ namespace drawinglayer
{
const basegfx::BColor
aColorA(maBColorModifierStack.getModifiedColor(rCandidate.getColorA()));
const basegfx::BColor
aColorB(maBColorModifierStack.getModifiedColor(rCandidate.getColorB()));
-const double
fDiscreteUnit((getViewInformation2D().getInverseObjectToViewTransformation() *
basegfx::B2DVector(1.0, 0.0)).getLength());
+const basegfx::B2DVector
aDiscreteVector(getViewInformation2D().getInverseObjectToViewTransformation() *
basegfx::B2DVector(1.0, 1.0));
+const double
fDiscreteUnit(std::min(fabs(aDiscreteVector.getX()),
fabs(aDiscreteVector.getY(;
// use color distance and discrete lengths to calculate step
count
const sal_uInt32 nSteps(calculateStepsForSvgGradient(aColorA,
aColorB, fDelta, fDiscreteUnit));
@@ -1438,7 +1439,8 @@ namespace drawinglayer
{
const basegfx::BColor
aColorA(maBColorModifierStack.getModifiedColor(rCandidate.getColorA()));
const basegfx::BColor
aColorB(maBColorModifierStack.getModifiedColor(rCandidate.getColorB()));
-const double
fDiscreteUnit((getViewInformation2D().getInverseObjectToViewTransformation() *
basegfx::B2DVector(1.0, 0.0)).getLength());
+const basegfx::B2DVector
aDiscreteVector(getViewInformation2D().getInverseObjectToViewTransformation() *
basegfx::B2DVector(1.0, 1.0));
+const double
fDiscreteUnit(std::min(fabs(aDiscreteVector.getX()),
fabs(aDiscreteVector.getY(;
// use color distance and discrete lengths to calculate step
count
const sal_uInt32 nSteps(calculateStepsForSvgGradient(aColorA,
aColorB, fDeltaScale, fDiscreteUnit));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: menu question
On Wed, 2013-06-05 at 20:54 +0200, Cor Nouws wrote: > Hi, > > Have build successful on Ubuntu with 727e63452dc4de88d5dc62d5b1da6da0647564b > where I added > > >~Templates > > Can you provide the full thing as a patch. A quick read through it suggest that it should have worked. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc' - config_host.mk.in configure.ac connectivity/Library_firebird-sdbc.mk download.lst firebird/ExternalPackage_firebird.mk firebird/Externa
Library_merged.mk |2 Makefile.fetch |5 - RepositoryExternal.mk | 77 + RepositoryModule_build.mk |1 RepositoryModule_host.mk |1 config_host.mk.in |3 configure.ac | 13 +++- connectivity/Library_firebird-sdbc.mk |2 download.lst |4 - firebird/ExternalPackage_firebird.mk | 15 ++-- firebird/ExternalProject_firebird.mk | 16 - firebird/Module_firebird.mk|4 - libatomic_ops/ExternalPackage_libatomic_ops.mk | 20 ++ libatomic_ops/ExternalProject_libatomic_ops.mk | 26 libatomic_ops/Makefile |7 ++ libatomic_ops/Module_libatomic_ops.mk | 22 +++ libatomic_ops/README |4 + libatomic_ops/UnpackedTarball_libatomic_ops.mk | 14 18 files changed, 183 insertions(+), 53 deletions(-) New commits: commit 0db44dd51be829bc8fa8e6750b8755f73265ce2c Author: Andrzej J.R. Hunt Date: Fri Jun 14 14:55:22 2013 +0100 Build firebird 2.5 internally. Also adds libatomic_ops. Change-Id: I44a45e781dfb3624cdebf4530ae44870bf39a82a diff --git a/Library_merged.mk b/Library_merged.mk index 6e404df..b66120d 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -48,6 +48,8 @@ $(eval $(call gb_Library_use_externals,merged,\ icuuc \ jpeg \ lcms2 \ + libatomic_ops \ + libfbembed \ liblangtag \ libxml2 \ libxslt \ diff --git a/Makefile.fetch b/Makefile.fetch index f1922e5..3cca2b4 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -74,10 +74,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) @mkdir -p $(TARFILE_LOCATION)/tmp @date >> $(fetch_LOGFILE) $(foreach item, \ - $(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \ - ,$(call fetch_Download_item_special,http://people.igalia.com/agomez/files,$(item))) - $(foreach item, \ + $(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \ $(call fetch_Optional,CDR,CDR_TARBALL) \ + $(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ $(call fetch_Optional,VISIO,VISIO_TARBALL) \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f7a1b64..2062b0a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -680,6 +680,48 @@ gb_LinkTarget__use_jawt := endif # $(OS)$(COM) = WNTGCC +ifeq ($(SYSTEM_LIBATOMIC_OPS),YES) + +define gb_LinkTarget__use_libatomic_ops +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(LIBATOMIC_OPS_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1), $(LIBATOMIC_OPS_LIBS)) + +endef +gb_ExternalProject__use_libatomic_ops := + +else # !SYSTEM_LIBATOMIC_OPS + +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ +libatomic-ops-7.2d \ +)) + + +define gb_LinkTarget__use_libatomic_ops +$(call gb_LinkTarget_set_include,$(1),\ +$(LIBATOMIC_OPS_CFLAGS) \ + $$(INCLUDE) \ + $(LIBATOMIC_OPS_CFLAGS) \ +) +$(call gb_LinkTarget_use_package,$(1),\ + libatomic_ops \ +) +$(call gb_LinkTarget_use_static_libraries,$(1),\ + libatomic_ops \ +) + +endef + +define gb_ExternalProject__use_libatomic_ops +$(call gb_ExternalProject_use_package,$(1),libatomic_ops) + +endef + +endif # SYSTEM_LIBATOMIC_OPS + + ifeq ($(SYSTEM_LIBEXTTEXTCAT),YES) define gb_LinkTarget__use_libexttextcat @@ -2178,6 +2220,8 @@ ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) ifeq ($(SYSTEM_FIREBIRD),YES) +$(call gb_LinkTarget__use_libatomic_ops,$(1)) + define gb_LinkTarget__use_firebird $(call gb_LinkTarget_set_include,$(1),\ $(FIREBIRD_CFLAGS) \ @@ -2192,37 +2236,26 @@ endef else # !SYSTEM_FIREBIRD -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - firebird \ +#$(call gb_LinkTarget__use_libatomic_ops,$(1)) + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ +fbembed \ )) -define gb_LinkTarget__use_firebird -$(call gb_LinkTarget_use_unpacked,$(1),firebird) + +define gb_LinkTarget__use_libfbembed +$(call gb_LinkTarget_use_package,$(1),firebird) $(call gb_LinkTarget_set_include,$(1),\ - -I$(OUTDIR)/inc/external/firebird \ $$(INCLUDE) \ + -I$(call gb_UnpackedTarball_get_dir,firebird)/src/include \ + -I$(call gb_UnpackedTarball_get_dir,firebird)/src/include/gen \ + -I$(call gb_UnpackedTarball_get_dir,firebird)/src/jrd \ ) $(call gb_LinkTarget_use_libraries,$(1),\ - firebird \ +fbembed \ ) endef -# $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ -# atomic_o
Re: Please hold off modifying sc in the next few weeks
Hi Kohei, On Fri, Jun 14, 2013 at 10:37:46AM -0400, Kohei Yoshida wrote: > I'm not shutting down all development. If you know what you are > doing and know that your change won't affect my ScColumn cell > storage rework, feel free to push. Its just that this is rather hard to judge for someone not too familiar with the area of code, and "Please hold off modifying sc in the next few weeks" is a rather generic and scary email subject. ;) > I can't give any more concrete time frame than the next few weeks, > since even *I* don't know exactly when it will finish. As I said: How about saying "until the end of this month" and then announce you need another week or so on demand. Having such a generic "hold of modifying sc" mail out there easily creates urban myths a la "I heard we should not touch sc and I havent seen a mail unblocking that" (even if there was one somewhere). I dont want you to commit yourself to a timeframe, just keep us up to date iteratively. > >b/ make that work trackable and visible on a regularly pushed branch (maybe > >even regularly rebased), so it easier to see where possible conflicts > > arise > I don't want to do that because this is a huge change that won't > even compile. I've been working on this in the past 3 to 4 weeks > without being able to build it. And as I understand it some people > (especially those who admin bibisect, tinderboxes etc) do want to > make sure that each commit is at least buildable, if I'm not > mistaken. Yep, guessed so. > But if you really want to see what's going on, track my change on > feature/formula-core-rework > at > ssh://anarchy.freedesktop.org/~kohei/libreoffice/core Great, thanks. But why not have that branch directly on the repo, where it is much easier to track for everyone? > Or, if none of these make sense, or you find this confusing or too > restricting, then just ignore my request and go on with your lives. No, it makes perfect sense and some of this pain is unavoidable -- its just that the more discoverable the stuff is the easier it is to avoid misunderstandings. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f3/118889a0cd941f193e9b6557c0792015d77a34
f3/118889a0cd941f193e9b6557c0792015d77a34 |1 + 1 file changed, 1 insertion(+) New commits: commit 77864bfed5dc927c2239f8c47024ea1cdb1a4ba3 Author: Caolán McNamara Date: Fri Jun 14 16:05:17 2013 +0100 Notes added by 'git notes add' diff --git a/f3/118889a0cd941f193e9b6557c0792015d77a34 b/f3/118889a0cd941f193e9b6557c0792015d77a34 new file mode 100644 index 000..f8d6796 --- /dev/null +++ b/f3/118889a0cd941f193e9b6557c0792015d77a34 @@ -0,0 +1 @@ +merged as: 9bb96049addebd8907854730713d8a3f5f033e34 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c9/0a6ca92b1239d01a2892e15488e4a183a88b1a
c9/0a6ca92b1239d01a2892e15488e4a183a88b1a |1 + 1 file changed, 1 insertion(+) New commits: commit 91058b7dbb76fc0ba7ce27195613d42c3ae9d5e4 Author: Caolán McNamara Date: Fri Jun 14 16:05:37 2013 +0100 Notes added by 'git notes add' diff --git a/c9/0a6ca92b1239d01a2892e15488e4a183a88b1a b/c9/0a6ca92b1239d01a2892e15488e4a183a88b1a new file mode 100644 index 000..f8d6796 --- /dev/null +++ b/c9/0a6ca92b1239d01a2892e15488e4a183a88b1a @@ -0,0 +1 @@ +merged as: 9bb96049addebd8907854730713d8a3f5f033e34 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d8/4324ff612c652b0f6e7a91863808db4425c316
d8/4324ff612c652b0f6e7a91863808db4425c316 |1 + 1 file changed, 1 insertion(+) New commits: commit 4ed949ff1072c8257941bfa38a268010c3d4d7b0 Author: Caolán McNamara Date: Fri Jun 14 16:01:17 2013 +0100 Notes added by 'git notes add' diff --git a/d8/4324ff612c652b0f6e7a91863808db4425c316 b/d8/4324ff612c652b0f6e7a91863808db4425c316 new file mode 100644 index 000..55db068 --- /dev/null +++ b/d8/4324ff612c652b0f6e7a91863808db4425c316 @@ -0,0 +1 @@ +merged as: 322ee02748cf678495f73165905da0b0c2fd16a3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b2/cc0de3fc9adee90787ca760e86869f9255b380
b2/cc0de3fc9adee90787ca760e86869f9255b380 |1 + 1 file changed, 1 insertion(+) New commits: commit 45ab67709e1ff6261ed911e35999bf1d6ea2aa93 Author: Caolán McNamara Date: Fri Jun 14 16:00:50 2013 +0100 Notes added by 'git notes add' diff --git a/b2/cc0de3fc9adee90787ca760e86869f9255b380 b/b2/cc0de3fc9adee90787ca760e86869f9255b380 new file mode 100644 index 000..f8d6796 --- /dev/null +++ b/b2/cc0de3fc9adee90787ca760e86869f9255b380 @@ -0,0 +1 @@ +merged as: 9bb96049addebd8907854730713d8a3f5f033e34 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac | 28 +++-
1 file changed, 23 insertions(+), 5 deletions(-)
New commits:
commit 10919e4074ca5c90925988917f3edf730c4267e5
Author: Stephan Bergmann
Date: Fri Jun 14 16:37:49 2013 +0200
Better approximation of HAVE_THREADSAFE_STATICS for Clang
Change-Id: Ie29aa2e970f06a4a5bef672afe17b085600e7b88
diff --git a/configure.ac b/configure.ac
index b1e910e..673f774 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5445,13 +5445,31 @@ if test "$GCC" = "yes"; then
dnl GNU/Linux" machine); see the definition of __cxa_guard_acquire in GCC's
dnl libstdc++-v3/libsupc++/guard.cc for what #ifdefs actually make a
dnl difference there. Conservative advice from Jakub Jelinek is to assume
-dnl it working in GCC >= 4.3:
-if test "$_os" = "Darwin" -o $_os = Android -o "${GCCVER?}" -lt 040300;
then
-AC_MSG_RESULT([broken (i.e., no)])
-else
-HAVE_THREADSAFE_STATICS=TRUE
+dnl it working in GCC >= 4.3, so conservative way to check here is to use
+dnl GCCVER for GCC but resort to __GLIBCXX__ corresponding to libstdc++
+dnl shipped with GCC 4.3.0 (cf. ; 4.3.0 is 20080306, 4.2.4 is
+dnl 20080519, 4.3.1 is 20080606) for Clang (for which GCCVER is notoriously
+dnl "too old"):
+if test "$_os" != Darwin -a "$_os" != Android; then
+if test "$COM_GCC_IS_CLANG" = TRUE; then
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include
+#if !defined __GLIBCXX__ ||(__GLIBCXX__ < 20080606 && __GLIBCXX__ != 20080306)
+#error
+#endif
+]])],[HAVE_THREADSAFE_STATICS=TRUE],[])
+AC_LANG_POP([C++])
+elif test "${GCCVER?}" -ge 040300; then
+HAVE_THREADSAFE_STATICS=TRUE
+fi
+fi
+if test "$HAVE_THREADSAFE_STATICS" = TRUE; then
AC_DEFINE(HAVE_THREADSAFE_STATICS)
AC_MSG_RESULT([yes])
+else
+AC_MSG_RESULT([broken (i.e., no)])
fi
else
AC_MSG_RESULT([unknown (assuming no)])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Please hold off modifying sc in the next few weeks
On 14/06/13 16:11, Bjoern Michaelsen wrote: > Im not too happy with essentially shutting down all development on master on > one application for an undefined timeframe. Can we make this a bit more > bearable by: Bjoern, just read it again. He is asking not to merge changes like german comments or the wholesale string/sal_Bool changes that are low priority but complicate life when one tries to rebase changes. He also did not speak about indefinite. Kohei is know to be a fast and concise fellow, so don't worry, it will not take the same time as chart2. He just implores the clemency of the pears to make his re-factoring less of PITA. F. > a/ a concrete timeframe, I would suggest until the 2013-06-30 >(with the option to extend the block another week a few days before the end >should the need arise) > b/ make that work trackable and visible on a regularly pushed branch (maybe >even regularly rebased), so it easier to see where possible conflicts arise > c/ instead of suggesting to stop all work on calc, divert those changes to >gerrit, were those could stay "on hold" until the refactoring is done, and >be merged in due time afterwards ... > > Note also that some string refactorings or friends are global (e.g. removing a > member function), and excluding these would block all of LO, which is > obviously > not a good thing. > > Best, > > Bjoern > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Please hold off modifying sc in the next few weeks
On 06/14/2013 10:11 AM, Bjoern Michaelsen wrote: Hi Kohei, On Fri, Jun 14, 2013 at 09:29:56AM -0400, Kohei Yoshida wrote: I'm in the middle of a huge (I mean huge) refactoring in Calc core, which will take at least in the next few weeks to complete. It touches pretty much every piece of the code in ScColumn and many surrounding code. So, I'd appreciate it if you guys could hold off changes such as German comment translations and string conversions etc until this work is done. Having these other changes would only make my work a lot harder and I would have to spend more time merging, which delays completion of this work. Im not too happy with essentially shutting down all development on master on one application for an undefined timeframe. Can we make this a bit more bearable by: I'm not shutting down all development. If you know what you are doing and know that your change won't affect my ScColumn cell storage rework, feel free to push. Also, if your change is urgent, and/or you can't sleep at night until you push your change, go ahead and push. That means I instead may have to stay up late a little, but I guess nobody cares. a/ a concrete timeframe, I would suggest until the 2013-06-30 (with the option to extend the block another week a few days before the end should the need arise) I can't give any more concrete time frame than the next few weeks, since even *I* don't know exactly when it will finish. b/ make that work trackable and visible on a regularly pushed branch (maybe even regularly rebased), so it easier to see where possible conflicts arise I don't want to do that because this is a huge change that won't even compile. I've been working on this in the past 3 to 4 weeks without being able to build it. And as I understand it some people (especially those who admin bibisect, tinderboxes etc) do want to make sure that each commit is at least buildable, if I'm not mistaken. But if you really want to see what's going on, track my change on feature/formula-core-rework at ssh://anarchy.freedesktop.org/~kohei/libreoffice/core Right now I can't afford to make each commit meaningful, and each commit is not in a buildable state. What I'll do is to squash all these fragmented commits into one once I finish all necessary changes, make it buildable, and make it pass all existing unit tests, before merging to the main repo. c/ instead of suggesting to stop all work on calc, divert those changes to gerrit, were those could stay "on hold" until the refactoring is done, and be merged in due time afterwards ... Fine. Then, my request is for gerrit reviewers. Note also that some string refactorings or friends are global (e.g. removing a member function), and excluding these would block all of LO, which is obviously not a good thing. Whether it's a "good thing" or not, I'm simply requesting some assistance to make my life a bit easier (as it has been rather brutal in the past few weeks). If you think your change is important, feel free to push then. I'll have to suffer a bit more, but I guess I'm not a priority in the whole scope of this project, and I'm fine with it. Or, if none of these make sense, or you find this confusing or too restricting, then just ignore my request and go on with your lives. Peace, Kohei -- Kohei Yoshida, LibreOffice Calc hacker, SUSE. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - distro-configs/AppUpSUSEWin32.conf
distro-configs/AppUpSUSEWin32.conf |1 + 1 file changed, 1 insertion(+) New commits: commit b6e02eeff8447a1e0726fbab43da2f0cf0a205f2 Author: Andras Timar Date: Fri Jun 14 16:26:45 2013 +0200 sync AppUpSUSEWin32.conf with SUSEWin32.conf Change-Id: Id00334109ba953fb31079668ea52ab731bdb3d6a diff --git a/distro-configs/AppUpSUSEWin32.conf b/distro-configs/AppUpSUSEWin32.conf index 7118daf..970acfd 100644 --- a/distro-configs/AppUpSUSEWin32.conf +++ b/distro-configs/AppUpSUSEWin32.conf @@ -5,6 +5,7 @@ --with-intro-progressbar-position=115,225 --with-intro-progressbar-frame-color=138,154,137 --with-flat-logo-svg=$(SRC_ROOT)/icon-themes/galaxy/brand_suse_bw/about.svg +--with-about-background-svg=$(SRC_ROOT)/icon-themes/galaxy/brand_suse_bw/shell/about.svg --with-startcenter-left-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_suse_bw/shell/backing_left.png --with-startcenter-right-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_suse_bw/shell/backing_right.png --with-startcenter-rtl-left-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_suse_bw/shell/backing_left.png ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - distro-configs/AppUpSUSEWin32.conf
distro-configs/AppUpSUSEWin32.conf |1 + 1 file changed, 1 insertion(+) New commits: commit 08500125497c595bfdaaf51b0f2599df4a67c6d9 Author: Andras Timar Date: Fri Jun 14 16:26:45 2013 +0200 sync AppUpSUSEWin32.conf with SUSEWin32.conf Change-Id: Id00334109ba953fb31079668ea52ab731bdb3d6a diff --git a/distro-configs/AppUpSUSEWin32.conf b/distro-configs/AppUpSUSEWin32.conf index 7118daf..970acfd 100644 --- a/distro-configs/AppUpSUSEWin32.conf +++ b/distro-configs/AppUpSUSEWin32.conf @@ -5,6 +5,7 @@ --with-intro-progressbar-position=115,225 --with-intro-progressbar-frame-color=138,154,137 --with-flat-logo-svg=$(SRC_ROOT)/icon-themes/galaxy/brand_suse_bw/about.svg +--with-about-background-svg=$(SRC_ROOT)/icon-themes/galaxy/brand_suse_bw/shell/about.svg --with-startcenter-left-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_suse_bw/shell/backing_left.png --with-startcenter-right-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_suse_bw/shell/backing_right.png --with-startcenter-rtl-left-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_suse_bw/shell/backing_left.png ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - vcl/source
vcl/source/gdi/bitmapex.cxx | 34 +-
1 file changed, 5 insertions(+), 29 deletions(-)
New commits:
commit 891805e02f6a8dc8a8bb2dc3a7b854601c956a7d
Author: Thorsten Behrens
Date: Fri Jun 14 13:26:43 2013 +0200
Fixup alpha bitmap generation for Windows.
This improves upon d6f58fd25eeca84a94528409a05b80aa5172b8b8 by
using the BitmapEx ctor instead of manual initialisation. Several
EMF+ files would otherwise show up horribly mangled on Windows.
Change-Id: I1808cb45818f3f0118653164c83c49d6134b9324
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 59fc06a..8b22b94 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -868,9 +868,6 @@ bool BitmapEx::Create( const
::com::sun::star::uno::Reference<
::com::sun::star::rendering::XBitmapCanvas >
&xBitmapCanvas,
const Size &rSize )
{
-SetEmpty();
-Size aSize( rSize );
-
uno::Reference< beans::XFastPropertySet > xFastPropertySet( xBitmapCanvas,
uno::UNO_QUERY );
if( xFastPropertySet.get() )
{
@@ -890,38 +887,17 @@ bool BitmapEx::Create( const
::com::sun::star::uno::Reference<
pSalBmp = ImplGetSVData()->mpDefInst->CreateSalBitmap();
pSalMask = ImplGetSVData()->mpDefInst->CreateSalBitmap();
-if( pSalBmp->Create( xBitmapCanvas, aSize ) )
+Size aLocalSize(rSize);
+if( pSalBmp->Create( xBitmapCanvas, aLocalSize ) )
{
-#ifdef CLAMP_BITDEPTH_PARANOIA
-// did we get alpha mixed up in the bitmap itself
-// eg. Cairo Canvas ... yes performance of this is awful.
-if( pSalBmp->GetBitCount() > 24 )
-{
-// Format convert the pixels with generic code
-Bitmap aSrcPixels( pSalBmp );
-aBitmap = Bitmap( rSize, 24 );
-BitmapReadAccess aSrcRead( aSrcPixels );
-BitmapWriteAccess aDestWrite( aBitmap );
-aDestWrite.CopyBuffer( aSrcRead );
-}
-else
-#endif
-aBitmap = Bitmap( pSalBmp );
-
-aBitmapSize = rSize;
-if ( pSalMask->Create( xBitmapCanvas, aSize, true ) )
+if ( pSalMask->Create( xBitmapCanvas, aLocalSize, true ) )
{
-aMask = Bitmap( pSalMask );
-bAlpha = sal_True;
-aBitmapSize = rSize;
-eTransparent = !aMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP;
-
+*this = BitmapEx(Bitmap(pSalBmp), Bitmap(pSalMask) );
return true;
}
else
{
-bAlpha = sal_False;
-eTransparent = TRANSPARENT_NONE;
+*this = BitmapEx(Bitmap(pSalBmp));
return true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: OUString concatenation vs OUStringBuffer append
On 14/06/13 14:19, Matteo Casalin wrote:
Hi all,
in a recent patch [1] for String to OUString conversion I replaced the
construction of an OUString from a sequence of OUStringBuffer.append to a
single concatenation of OUString/constant strings [2].
Noel Power (whom I thank for the careful review, and is here in copy),
correctly asks which way is preferred for such an operation: I don't know the
answer, can some expert provide me an insight on this? I find OUString
concatenation easier to read, but this could be not as efficient as the
original code, or just undesired.
Thanks and kind regards
Matteo
[1]
https://gerrit.libreoffice.org/#/c/4280/
[2]
-OUStringBuffer aString;
-aString.append('(');
-aString.append(static_cast(nColMerge));
-aString.append(',');
-aString.append(static_cast(nRowMerge));
-aString.append(')');
-return aString.makeStringAndClear();
+OUString aRet = "("
++ OUString::number(static_cast(nColMerge))
++ ","
++ OUString::number(static_cast(nRowMerge))
++ ")";
+return aRet;
just a note, I don't find the changed code offensive or anything :-) in
fact the opposite I find it easier on the eye than OUStringBuffer But..
in this case the OUStringBuffer usage was the result of previous
rework. Prior to the OUStringBuffer rework the code looked quite like
the new OUString change, I know Lubos/Stephan have done lots of stuff
around strings and honestly ( although I am sure it probably is
mentioned somewhere in the mailing list ) I don't know what the current
preferred way is. I seem to remember something about OUString
concatenation now being as efficient as OUStringBuffer these days and
that the advantage of OUStringBuffer ( in such cases as above ) is not
as great. but really I can't recall
Noel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Please hold off modifying sc in the next few weeks
Hi Kohei, On Fri, Jun 14, 2013 at 09:29:56AM -0400, Kohei Yoshida wrote: > I'm in the middle of a huge (I mean huge) refactoring in Calc core, > which will take at least in the next few weeks to complete. It > touches pretty much every piece of the code in ScColumn and many > surrounding code. So, I'd appreciate it if you guys could hold off > changes such as German comment translations and string conversions > etc until this work is done. Having these other changes would only > make my work a lot harder and I would have to spend more time > merging, which delays completion of this work. Im not too happy with essentially shutting down all development on master on one application for an undefined timeframe. Can we make this a bit more bearable by: a/ a concrete timeframe, I would suggest until the 2013-06-30 (with the option to extend the block another week a few days before the end should the need arise) b/ make that work trackable and visible on a regularly pushed branch (maybe even regularly rebased), so it easier to see where possible conflicts arise c/ instead of suggesting to stop all work on calc, divert those changes to gerrit, were those could stay "on hold" until the refactoring is done, and be merged in due time afterwards ... Note also that some string refactorings or friends are global (e.g. removing a member function), and excluding these would block all of LO, which is obviously not a good thing. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: fdo#59727 calc add-in functions and xlsx im/export
Hi Winfried, On Tuesday, 2013-05-21 09:36:50 +0200, Winfried Donkers wrote: > A contribution to your post-vacation pile of mails... Lol, yeah.. > > Let's postpone this. I'll be on vacation now anyway and couldn't investigate > > or help. I may have to take over when I return. > > I'll leave the bug as it is, we'll communicate again when you're back and > have time. Let's resume next week. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpULlVYWqdvb.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) New commits: commit 38a8b6da3bae314f4a49ec6489e81e31f6cfb24d Author: Stephan Bergmann Date: Fri Jun 14 15:51:55 2013 +0200 grr Change-Id: Ib158bc873fc41bb5668a1da3d7c928f2757d80ab diff --git a/configure.ac b/configure.ac index abcd353..b1e910e 100644 --- a/configure.ac +++ b/configure.ac @@ -5690,19 +5690,18 @@ return !(i != 0 && j != 0); CXXFLAGS=$save_CXXFLAGS fi -if test "$HAVE_CXX11" != "TRUE"; then -if test -n "$CXXFLAGS_CXX11"; then -AC_MSG_NOTICE([Disabling C++11 support]) -CXXFLAGS_CXX11= -elif test "$CPP_LIBRARY" = LIBCPP -a $_os = Darwin; then -AC_MSG_ERROR([Selected libc++ but C++11 support broken]) -fi +if test "$HAVE_CXX11" = "TRUE"; then +AC_DEFINE(HAVE_CXX11) +elif test -n "$CXXFLAGS_CXX11"; then +AC_MSG_NOTICE([Disabling C++11 support]) +CXXFLAGS_CXX11= +elif test "$CPP_LIBRARY" = LIBCPP -a $_os = Darwin; then +AC_MSG_ERROR([Selected libc++ but C++11 support broken]) fi fi AC_SUBST(CXXFLAGS_CXX11) AC_SUBST(HAVE_CXX11) -AC_DEFINE(HAVE_CXX11) dnl == dnl Check for C++11 "= delete" support ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Please hold off modifying sc in the next few weeks
Hi there, I'm in the middle of a huge (I mean huge) refactoring in Calc core, which will take at least in the next few weeks to complete. It touches pretty much every piece of the code in ScColumn and many surrounding code. So, I'd appreciate it if you guys could hold off changes such as German comment translations and string conversions etc until this work is done. Having these other changes would only make my work a lot harder and I would have to spend more time merging, which delays completion of this work. Thanks a lot. Kohei -- Kohei Yoshida, LibreOffice Calc hacker, SUSE. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |1 + 1 file changed, 1 insertion(+) New commits: commit be4b5d56d7306260a61ba62126102acbda0fb28f Author: Stephan Bergmann Date: Fri Jun 14 15:22:56 2013 +0200 Missing AC_DEFINE(HAVE_CXX11) ...post d7ae9f7743d946845a8379e2fb47666f124e2c87 "rename HAVE_CXX0X->HAVE_CXX11 and clean up to #define in a config header." Change-Id: Ie8f62c78c9aabe06736a25e60a3035880470e7b5 diff --git a/configure.ac b/configure.ac index d834260..abcd353 100644 --- a/configure.ac +++ b/configure.ac @@ -5702,6 +5702,7 @@ fi AC_SUBST(CXXFLAGS_CXX11) AC_SUBST(HAVE_CXX11) +AC_DEFINE(HAVE_CXX11) dnl == dnl Check for C++11 "= delete" support ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
OUString concatenation vs OUStringBuffer append
Hi all,
in a recent patch [1] for String to OUString conversion I replaced the
construction of an OUString from a sequence of OUStringBuffer.append to a
single concatenation of OUString/constant strings [2].
Noel Power (whom I thank for the careful review, and is here in copy),
correctly asks which way is preferred for such an operation: I don't know the
answer, can some expert provide me an insight on this? I find OUString
concatenation easier to read, but this could be not as efficient as the
original code, or just undesired.
Thanks and kind regards
Matteo
[1]
https://gerrit.libreoffice.org/#/c/4280/
[2]
- OUStringBuffer aString;
- aString.append('(');
- aString.append(static_cast(nColMerge));
- aString.append(',');
- aString.append(static_cast(nRowMerge));
- aString.append(')');
- return aString.makeStringAndClear();
+ OUString aRet = "("
+ + OUString::number(static_cast(nColMerge))
+ + ","
+ + OUString::number(static_cast(nRowMerge))
+ + ")";
+ return aRet;
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: binaryurp/source
binaryurp/source/lessoperators.cxx | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 12dc490c3af9ec0f34b513609f3b14effd5a2906
Author: Stephan Bergmann
Date: Fri Jun 14 14:18:11 2013 +0200
No need for a buggy rewrite
... see 08bb8fca4144608237418d64b1479840c408256f "#i122208# replace the
binaryurp cache for improved C++ compatibility" and
059f041dfdffe0630ec573fb444c51cc463b90b1 "cppcheck: fix
duplicateExpression,"
when the only improvement is to not needlessly acquire/release raw
rtl_uString
instances.
Change-Id: I734304b231d69f8089cbf1d35a3deda75f771c78
diff --git a/binaryurp/source/lessoperators.cxx
b/binaryurp/source/lessoperators.cxx
index 3a515f5..6d8952d 100644
--- a/binaryurp/source/lessoperators.cxx
+++ b/binaryurp/source/lessoperators.cxx
@@ -32,16 +32,14 @@
namespace com { namespace sun { namespace star { namespace uno {
-bool operator<( const TypeDescription& rLeft, const TypeDescription& rRight) {
- assert( rLeft.is() && rRight.is());
- const typelib_TypeDescription& rA = *rLeft.get();
- const typelib_TypeDescription& rB = *rRight.get();
-if( rA.eTypeClass != rB.eTypeClass)
- return (rA.eTypeClass < rB.eTypeClass);
- const sal_Int32 nCmp = rtl_ustr_compare_WithLength(
- rA.pTypeName->buffer, rA.pTypeName->length,
- rB.pTypeName->buffer, rB.pTypeName->length);
- return (nCmp < 0);
+bool operator <(TypeDescription const & left, TypeDescription const & right) {
+assert(left.is() && right.is());
+typelib_TypeClass tc1 = left.get()->eTypeClass;
+typelib_TypeClass tc2 = right.get()->eTypeClass;
+return tc1 < tc2 ||
+(tc1 == tc2 &&
+ (OUString::unacquired(&left.get()->pTypeName) <
+ OUString::unacquired(&right.get()->pTypeName)));
}
bool TypeDescEqual::operator()( const TypeDescription& rLeft, const
TypeDescription& rRight) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - canvas/source drawinglayer/source
canvas/source/vcl/canvascustomsprite.cxx |5 ++---
drawinglayer/source/primitive2d/primitivetools2d.cxx |5 +++--
drawinglayer/source/processor2d/vclprocessor2d.cxx |6 --
3 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit a34f3fdf50dbf8eac0599dfb018fc0040ef2a2f0
Author: Armin Le Grand
Date: Fri Jun 14 12:02:40 2013 +
i12525 use X and Y for unit evaluation
diff --git a/drawinglayer/source/primitive2d/primitivetools2d.cxx
b/drawinglayer/source/primitive2d/primitivetools2d.cxx
index 1cd573c..e70fcff 100644
--- a/drawinglayer/source/primitive2d/primitivetools2d.cxx
+++ b/drawinglayer/source/primitive2d/primitivetools2d.cxx
@@ -38,8 +38,9 @@ namespace drawinglayer
{
::osl::MutexGuard aGuard( m_aMutex );
-// get the current DiscreteUnit
-const double
fDiscreteUnit((rViewInformation.getInverseObjectToViewTransformation() *
basegfx::B2DVector(1.0, 0.0)).getLength());
+// get the current DiscreteUnit, look at X and Y and use the
maximum
+const basegfx::B2DVector
aDiscreteVector(rViewInformation.getInverseObjectToViewTransformation() *
basegfx::B2DVector(1.0, 1.0));
+const double fDiscreteUnit(std::min(fabs(aDiscreteVector.getX()),
fabs(aDiscreteVector.getY(;
if(getBuffered2DDecomposition().hasElements() &&
!basegfx::fTools::equal(fDiscreteUnit, getDiscreteUnit()))
{
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index ea51d51..574d743 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -1279,7 +1279,8 @@ namespace drawinglayer
{
const basegfx::BColor
aColorA(maBColorModifierStack.getModifiedColor(rCandidate.getColorA()));
const basegfx::BColor
aColorB(maBColorModifierStack.getModifiedColor(rCandidate.getColorB()));
-const double
fDiscreteUnit((getViewInformation2D().getInverseObjectToViewTransformation() *
basegfx::B2DVector(1.0, 0.0)).getLength());
+const basegfx::B2DVector
aDiscreteVector(getViewInformation2D().getInverseObjectToViewTransformation() *
basegfx::B2DVector(1.0, 1.0));
+const double
fDiscreteUnit(std::min(fabs(aDiscreteVector.getX()),
fabs(aDiscreteVector.getY(;
// use color distance and discrete lengths to calculate step
count
const sal_uInt32 nSteps(calculateStepsForSvgGradient(aColorA,
aColorB, fDelta, fDiscreteUnit));
@@ -1321,7 +1322,8 @@ namespace drawinglayer
{
const basegfx::BColor
aColorA(maBColorModifierStack.getModifiedColor(rCandidate.getColorA()));
const basegfx::BColor
aColorB(maBColorModifierStack.getModifiedColor(rCandidate.getColorB()));
-const double
fDiscreteUnit((getViewInformation2D().getInverseObjectToViewTransformation() *
basegfx::B2DVector(1.0, 0.0)).getLength());
+const basegfx::B2DVector
aDiscreteVector(getViewInformation2D().getInverseObjectToViewTransformation() *
basegfx::B2DVector(1.0, 1.0));
+const double
fDiscreteUnit(std::min(fabs(aDiscreteVector.getX()),
fabs(aDiscreteVector.getY(;
// use color distance and discrete lengths to calculate step
count
const sal_uInt32 nSteps(calculateStepsForSvgGradient(aColorA,
aColorB, fDeltaScale, fDiscreteUnit));
commit 16235b6d5c6222fe6fdb49f30e885ba701050fdb
Author: Armin Le Grand
Date: Fri Jun 14 11:20:45 2013 +
i122485 Preliminary fix: Do not use 1Bit deep VDevs in Linux environment
diff --git a/canvas/source/vcl/canvascustomsprite.cxx
b/canvas/source/vcl/canvascustomsprite.cxx
index d567f2b..1287ed7 100644
--- a/canvas/source/vcl/canvascustomsprite.cxx
+++ b/canvas/source/vcl/canvascustomsprite.cxx
@@ -80,9 +80,8 @@ namespace vclcanvas
BackBufferSharedPtr pBackBuffer( new BackBuffer(
rOutDevProvider->getOutDev() ) );
pBackBuffer->setSize( aSize );
-// create mask backbuffer, with one bit color depth
-BackBufferSharedPtr pBackBufferMask( new BackBuffer(
rOutDevProvider->getOutDev(),
- true ) );
+// create mask backbuffer, with one bit color depth #122485# use full
depth to avoid problem with 1bit depth, get AAed masks
+BackBufferSharedPtr pBackBufferMask( new BackBuffer(
rOutDevProvider->getOutDev() ) ); // , true ) ); // #122485#
pBackBufferMask->setSize( aSize );
// TODO(F1): Implement alpha vdev (could prolly enable
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - vcl/source
vcl/source/gdi/bitmapex.cxx | 34 +-
1 file changed, 5 insertions(+), 29 deletions(-)
New commits:
commit fefab3bb38f55471d9fa9316d1249ad00adefc37
Author: Thorsten Behrens
Date: Fri Jun 14 13:26:43 2013 +0200
Fixup alpha bitmap generation for Windows.
This improves upon d6f58fd25eeca84a94528409a05b80aa5172b8b8 by
using the BitmapEx ctor instead of manual initialisation. Several
EMF+ files would otherwise show up horribly mangled on Windows.
Change-Id: I1808cb45818f3f0118653164c83c49d6134b9324
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 59fc06a..8b22b94 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -868,9 +868,6 @@ bool BitmapEx::Create( const
::com::sun::star::uno::Reference<
::com::sun::star::rendering::XBitmapCanvas >
&xBitmapCanvas,
const Size &rSize )
{
-SetEmpty();
-Size aSize( rSize );
-
uno::Reference< beans::XFastPropertySet > xFastPropertySet( xBitmapCanvas,
uno::UNO_QUERY );
if( xFastPropertySet.get() )
{
@@ -890,38 +887,17 @@ bool BitmapEx::Create( const
::com::sun::star::uno::Reference<
pSalBmp = ImplGetSVData()->mpDefInst->CreateSalBitmap();
pSalMask = ImplGetSVData()->mpDefInst->CreateSalBitmap();
-if( pSalBmp->Create( xBitmapCanvas, aSize ) )
+Size aLocalSize(rSize);
+if( pSalBmp->Create( xBitmapCanvas, aLocalSize ) )
{
-#ifdef CLAMP_BITDEPTH_PARANOIA
-// did we get alpha mixed up in the bitmap itself
-// eg. Cairo Canvas ... yes performance of this is awful.
-if( pSalBmp->GetBitCount() > 24 )
-{
-// Format convert the pixels with generic code
-Bitmap aSrcPixels( pSalBmp );
-aBitmap = Bitmap( rSize, 24 );
-BitmapReadAccess aSrcRead( aSrcPixels );
-BitmapWriteAccess aDestWrite( aBitmap );
-aDestWrite.CopyBuffer( aSrcRead );
-}
-else
-#endif
-aBitmap = Bitmap( pSalBmp );
-
-aBitmapSize = rSize;
-if ( pSalMask->Create( xBitmapCanvas, aSize, true ) )
+if ( pSalMask->Create( xBitmapCanvas, aLocalSize, true ) )
{
-aMask = Bitmap( pSalMask );
-bAlpha = sal_True;
-aBitmapSize = rSize;
-eTransparent = !aMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP;
-
+*this = BitmapEx(Bitmap(pSalBmp), Bitmap(pSalMask) );
return true;
}
else
{
-bAlpha = sal_False;
-eTransparent = TRANSPARENT_NONE;
+*this = BitmapEx(Bitmap(pSalBmp));
return true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#64656 RTF import: handle levelnumbers without leveltext
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4219 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4219 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I34ce7b172dc94489f7f506796e66b14598aab19c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Miklos Vajna Gerrit-Reviewer: Noel Power ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - writerfilter/qa writerfilter/source
writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf | 10 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 +
2 files changed, 11 insertions(+)
New commits:
commit f6c8a7f90154ea7251bf7aa8eb6f2db14252060a
Author: Miklos Vajna
Date: Mon Jun 10 09:43:01 2013 +0200
fdo#64656 RTF import: handle levelnumbers without leveltext
(cherry picked from commit 2c64af529567324f4433984ed7673304d26062c8)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: I34ce7b172dc94489f7f506796e66b14598aab19c
Reviewed-on: https://gerrit.libreoffice.org/4219
Reviewed-by: Noel Power
Tested-by: Noel Power
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf
b/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf
new file mode 100644
index 000..1c815c4
--- /dev/null
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf
@@ -0,0 +1,10 @@
+{\rtf
+{\*\listtable
+{\list \listtemplateid3794224 \listhybrid
+{\listlevel \levelnfc0 \levelnfcn0 \leveljc0 \leveljcn0 \levelstartat1
\levelfollow0 \levelspace0 \levelindent0 \levellegal0 \levelnorestart0
+{\levelnumbers ;}
+}
+{\listname ;}
+\listid258183 }
+}
+}
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index e06bace..f9bcdc1 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3727,6 +3727,7 @@ int RTFDocumentImpl::popState()
}
break;
case DESTINATION_LEVELNUMBERS:
+if (aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_lvlText))
{
RTFSprms& rAttributes =
aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_lvlText)->getAttributes();
RTFValue::Pointer_t pValue =
rAttributes.find(NS_ooxml::LN_CT_LevelText_val);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/util
sc/util/scfilt.component |3 --- 1 file changed, 3 deletions(-) New commits: commit 369ecc76d4d30009d53769e48169f00d6eb3cdc2 Author: Eike Rathke Date: Fri Jun 14 13:31:47 2013 +0200 ditch dangling reference to com.sun.star.comp.oox.xls.FormulaParser Change-Id: I185a9854ca2ce43f1f880f5ea2bb3b68a1757ca9 (cherry picked from commit f2fd2a66ee827024b31a310d67804cb7cb18d2da) diff --git a/sc/util/scfilt.component b/sc/util/scfilt.component index 292fbd4..13b884b 100644 --- a/sc/util/scfilt.component +++ b/sc/util/scfilt.component @@ -26,7 +26,4 @@ - - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Remove useless attributions in starmath
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4282
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/4282/1
Remove useless attributions in starmath
These values are initialized as 0 in the constructor(see
starmath/source/parse.cxx).
Change-Id: I68508f7f7132a2f43b99da3e7cdef9709fd62598
---
M starmath/source/mathmlimport.cxx
1 file changed, 0 insertions(+), 29 deletions(-)
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index b5f0529..4d1f95e 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -719,7 +719,6 @@
{
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
if (nIsBold != -1)
@@ -960,7 +959,6 @@
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TPHANTOM;
@@ -1024,7 +1022,6 @@
{
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.aText = ",";
aToken.eType = TLEFT;
aToken.nLevel = 5;
@@ -1110,7 +1107,6 @@
: SmXMLImportContext(rImport,nPrefix,rLName)
{
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TNUMBER;
}
@@ -1190,7 +1186,6 @@
: SmXMLImportContext(rImport,nPrefix,rLName)
{
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TTEXT;
}
@@ -1223,7 +1218,6 @@
: SmXMLImportContext(rImport,nPrefix,rLName)
{
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TTEXT;
}
@@ -1267,7 +1261,6 @@
: SmXMLImportContext(rImport,nPrefix,rLName),aStyleHelper(*this)
{
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TIDENT;
}
@@ -1332,7 +1325,6 @@
const OUString& rLName)
: SmXMLImportContext(rImport,nPrefix,rLName), bIsStretchy(sal_False)
{
-aToken.nGroup = 0;
aToken.eType = TSPECIAL;
aToken.nLevel = 5;
}
@@ -1404,7 +1396,6 @@
{
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.eType = TBLANK;
aToken.nLevel = 5;
SmBlankNode *pBlank = new SmBlankNode(aToken);
@@ -1441,8 +1432,6 @@
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = eType;
SmSubSupNode *pNode = new SmSubSupNode(aToken);
SmNodeStack &rNodeStack = GetSmImport().GetNodeStack();
@@ -1503,8 +1492,6 @@
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = eType;
SmSubSupNode *pNode = new SmSubSupNode(aToken);
SmNodeStack &rNodeStack = GetSmImport().GetNodeStack();
@@ -1557,8 +1544,6 @@
SmNode *pTest = lcl_popOrZero(rNodeStack);
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = TUNDERLINE;
@@ -1632,8 +1617,6 @@
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = TACUTE;
SmAttributNode *pNode = new SmAttributNode(aToken);
@@ -1701,7 +1684,6 @@
{
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.aText = "";
aToken.nLevel = 5;
aToken.eType = TIDENT;
@@ -2184,8 +2166,6 @@
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = TOVER;
SmStructureNode *pSNode = new SmBinVerNode(aToken);
SmNode *pOper = new SmRectangleNode(aToken);
@@ -2205,8 +2185,6 @@
SmToken aToken;
aToken.cMathChar = MS_SQRT; //Temporary: alert, based on StarSymbol font
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = TNROOT;
SmStructureNode *pSNode = new SmRootNode(aToken);
SmNode *pOper = new SmRootSymbolNode(aToken);
@@ -2229,8 +2207,6 @@
SmToken aToken;
aToken.cMathChar = MS_SQRT; //Temporary: alert, based on StarSymbol font
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = TSQRT;
SmStructureNode *pSNode = new SmRootNode(aToken);
SmNode *pOper = new SmRootSymbolNode(aToken);
@@ -2266,7 +2242,6 @@
{
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
int nLeft=0,nRight=0;
@@ -2321,7 +2296,6 @@
aRelationArray.resize(1);
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TNEWLINE;
aRelationArray[0] = new SmLineNode(aToken);
@@ -2452,8 +2426,6 @@
{
SmToken aToken;
aToken.cMathChar = '\0';
-
[Libreoffice-commits] core.git: sc/util
sc/util/scfilt.component |3 --- 1 file changed, 3 deletions(-) New commits: commit f2fd2a66ee827024b31a310d67804cb7cb18d2da Author: Eike Rathke Date: Fri Jun 14 13:31:47 2013 +0200 ditch dangling reference to com.sun.star.comp.oox.xls.FormulaParser Change-Id: I185a9854ca2ce43f1f880f5ea2bb3b68a1757ca9 diff --git a/sc/util/scfilt.component b/sc/util/scfilt.component index c4b3728..1414435 100644 --- a/sc/util/scfilt.component +++ b/sc/util/scfilt.component @@ -23,7 +23,4 @@ - - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: oox service mess
Hi Stephan, On Friday, 2013-06-14 09:01:19 +0200, Stephan Bergmann wrote: > >>Anyway, if that OOXMLFormulaParser implementation should be gone for > >>good, the dangling reference to it should be remove from > >>sc/util/scfilt.component. > > > >Which in the mean time seems to be done. > > No, current sc/util/scfilt.component still contains > > > > > > > My bad, I grep'ed for OOXMLFormulaParser ... Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpwC1GtES6Qa.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/ucbhelper offapi/com officecfg/registry ucbhelper/source
include/ucbhelper/registerucb.hxx |9 +
offapi/com/sun/star/ucb/XContentProviderManager.idl|2
officecfg/registry/data/org/openoffice/ucb/Configuration.xcu | 11 ++
officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs |2
ucbhelper/source/provider/registerucb.cxx | 46
+-
5 files changed, 46 insertions(+), 24 deletions(-)
New commits:
commit aa892d2b432319f949d0b45a0529036984f1aad7
Author: Stephan Bergmann
Date: Fri Jun 14 13:05:46 2013 +0200
Fix support for "dummy" content providers
...and use it so that private: URLs are not needlessly passed to the gio or
gnome-vfs "catch-all" UCPs.
Change-Id: I85d100567d1641130449fe21ccd072bcc0ec0979
diff --git a/include/ucbhelper/registerucb.hxx
b/include/ucbhelper/registerucb.hxx
index 89b1d00..b50d2f6 100644
--- a/include/ucbhelper/registerucb.hxx
+++ b/include/ucbhelper/registerucb.hxx
@@ -42,6 +42,10 @@ namespace ucbhelper {
struct ContentProviderData
{
/** The UNO service name to use to instanciate the content provider.
+
+If it is the empty string, a null provider will be used (see the
+documentation of the Provider argument to
+com.sun.star.ucb.XContentProviderManager.registerContentProvider).
*/
OUString ServiceName;
@@ -71,7 +75,10 @@ typedef std::vector< ContentProviderData >
ContentProviderDataList;
@param rServiceFactory A factory through which to obtain the required
services.
-@param rName The service name of the content provider.
+@param rName The service name of the content provider. If it is the empty
+string, a null provider will be used (see the documentation of the Provider
+argument to
+com.sun.star.ucb.XContentProviderManager.registerContentProvider).
@param rArguments Any arguments to instantiate the content provider with.
diff --git a/offapi/com/sun/star/ucb/XContentProviderManager.idl
b/offapi/com/sun/star/ucb/XContentProviderManager.idl
index 9720834..aa6b453 100644
--- a/offapi/com/sun/star/ucb/XContentProviderManager.idl
+++ b/offapi/com/sun/star/ucb/XContentProviderManager.idl
@@ -146,7 +146,7 @@ published interface XContentProviderManager:
com::sun::star::uno::XInterface
a content identifier (i.e., a URL).
@returns
-a content provider.
+a content provider, or null.
*/
com::sun::star::ucb::XContentProvider queryContentProvider(
[in] string Identifier );
diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
index a316390..e9704d3 100644
--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
@@ -188,6 +188,17 @@
+
+
+
+
+
+private
+
+
+
+
+
diff --git a/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
b/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
index 9fb25e8..872177d 100644
--- a/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
+++ b/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
@@ -28,7 +28,7 @@
- Specifies the name of the UNO service to be used to
instantiate the UCP.
+ Specifies the name of the UNO service to be used to
instantiate the UCP. If it is the empty string, a null provider will be used
(see the documentation of the Provider argument to
com.sun.star.ucb.XContentProviderManager.registerContentProvider).
diff --git a/ucbhelper/source/provider/registerucb.cxx
b/ucbhelper/source/provider/registerucb.cxx
index bce135f..a7b4384 100644
--- a/ucbhelper/source/provider/registerucb.cxx
+++ b/ucbhelper/source/provider/registerucb.cxx
@@ -58,31 +58,35 @@ registerAtUcb(
copy(RTL_CONSTASCII_LENGTH("{noproxy}")) :
rArguments);
-// First, try to instantiate proxy for provider:
uno::Reference< ucb::XContentProvider > xProvider;
-if (!bNoProxy)
+
+if (!rName.isEmpty())
{
-uno::Reference< ucb::XContentProviderFactory > xProxyFactory;
-try
+// First, try to instantiate proxy for provider:
+if (!bNoProxy)
{
-xProxyFactory = ucb::ContentProviderProxyFactory::create(
rxContext );
+uno::Reference< ucb::XContentProviderFactory > xProxyFactory;
+try
+{
+xProxyFactory = ucb::ContentProviderProxyFactory::create(
rxContext );
+}
+catch (uno::Exception const &) {}
+OSL_ENSURE(xProxyFactory.is(), "No C
Gerrit migration RESCHEDULED
Hello, as we have an unexpected board meeting next Wednesday, that would collide with the planned Gerrit migration previously announced, we have to reschedule this to Thursday, June 27th, starting at about 1600 UTC Please raise your voice should this date not fit at all. Expected downtime of Gerrit would be sometime between 1 and 3 hours. Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-l10n] Deckard: a web based Glade Runner
Hi everyone, On the launchpad page, it says: "In the long run, it would be cool to have distinct instances for distinct projects like Xfce or LibreOffice." Yes, I though Deckard could be useful for LO when I read the 4.0 changelog about the new .uis. As I understand it, the runner takes translation from a po file in a repository, converts it and displays the dialog. So, to see the result, it is necessary to upload po file to the repository. Yes, the runner basically needs a folder containing a .ui and a .mo file. The layout expected by Deckard is documented in the README file: http://bazaar.launchpad.net/~malizor/deckard/trunk/view/head:/README#L90 I wrote a script that create such a layout from Gnome git repositories (which run once a day), so you may just want to write a similar script for LO. In fact I was planning to write one at some point, but it would be much easier for someone familiar with the LO organisation. > Looks great. I think it should basically "just work" for LibreOffice and > the 250+ new .ui elements. Our .uis pretend to be gtk3 ones, with a > handful of custom widgets, mostly previews. We have a glade catalog for > the custom ones to provide stubs for glade. So, what does deckard do > there, does it load the .ui with standard gtk3 code, i.e. expects all > the widgets to be instantiatable, or does it load it the glade way, i.e. > can reuse a glade catalog to handle those ? It instantiates all widgets. If it encounters an unknown one, it tries to replace it with a placeholder. All this magic happens in the "gladerunner.py" file (you can download it and easily experiment with it in a standalone way). It may be possible to make it work with a glade catalog, I will try to have a look at it (though I don't have much free time currently). > There might also be a little bit of tweaking required to stitch the .po > and .ui together because we're not (currently) using gettext natively in > LibreOffice but are using it as an intermediate format so it probably > wouldn't work to just throw a libreoffice .po with translations for a > dialog at the normal gtk3 gettext loader and get it to do the right > thing. It is true that Deckard is a bit Gnome centric for now, so any suggestion or patch (better :p) to make Deckard more suitable for other projects/infrastructures would be very much welcomed. Cheers, Nicolas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Limit - New Database feature
Le 14/06/13 10:39, Zolnai Tamás a écrit : Hi Tamás, >So I fixed it inside LO and so in RC1 it will work. Great news ! Thanks :-)) Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/aqua
vcl/aqua/source/dtrans/PictToBmpFlt.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit dc2d434687f701884f7c11e130669f63fb606074 Author: Tor Lillqvist Date: Fri Jun 14 13:23:42 2013 +0300 s/rtl_copyMemory/memmove Change-Id: Iead9b7ee98a11ad5a9916d6e176c8938378b817a diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx index 61cb721..3d5c3a7 100644 --- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx +++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx @@ -63,7 +63,7 @@ bool PICTtoPNG( com::sun::star::uno::Sequence& rPictData, rPngData.realloc( nPngSize); HLock( hPng); -rtl_copyMemory( rPngData.getArray(), ((sal_Int8*)*hPng), nPngSize); +memmove( rPngData.getArray(), ((sal_Int8*)*hPng), nPngSize); HUnlock( hPng); } @@ -120,7 +120,7 @@ bool PNGtoPICT( com::sun::star::uno::Sequence& rPngData, rPictData.realloc( nPictSize); HLock( (Handle)hPict); -rtl_copyMemory( rPictData.getArray(), ((sal_Int8*)*hPict), nPictSize); +memmove( rPictData.getArray(), ((sal_Int8*)*hPict), nPictSize); HUnlock( (Handle)hPict); // Release the data associated with the picture ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source ucb/source
include/ucbhelper/registerucb.hxx | 26 +-
ucb/source/core/ucb.cxx |3 +--
ucbhelper/source/provider/registerucb.cxx | 11 +--
3 files changed, 3 insertions(+), 37 deletions(-)
New commits:
commit f31d4ad929339b4a06d5f84b14a2198345d88757
Author: Stephan Bergmann
Date: Fri Jun 14 12:22:40 2013 +0200
Remove unused ContentProviderRegistrationInfo
Change-Id: Ic30cbc95b4baa4dabaa0f8f8e129aa5cf4ca5f2f
diff --git a/include/ucbhelper/registerucb.hxx
b/include/ucbhelper/registerucb.hxx
index 183dabd..89b1d00 100644
--- a/include/ucbhelper/registerucb.hxx
+++ b/include/ucbhelper/registerucb.hxx
@@ -22,7 +22,6 @@
#include
#include
-#include
#include
#include
@@ -37,28 +36,6 @@ namespace com { namespace sun { namespace star {
namespace ucbhelper {
//
-/** Information about a registered content provider.
- */
-struct ContentProviderRegistrationInfo
-{
-/** The registered content provider (or null if registration failed).
- */
-com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >
-m_xProvider;
-
-/** The arguments the content provider was instantiated with.
- */
-OUString m_aArguments;
-
-/** The URL template the content provider is registered on.
- */
-OUString m_aTemplate;
-};
-
-typedef std::vector< ContentProviderRegistrationInfo >
-ContentProviderRegistrationInfoList;
-
-//
/** Information about a content provider, passed to
configureUcb.
*/
@@ -113,8 +90,7 @@ UCBHELPER_DLLPUBLIC bool registerAtUcb(
rxContext,
OUString const & rName,
OUString const & rArguments,
-OUString const & rTemplate,
-ContentProviderRegistrationInfo * pInfo)
+OUString const & rTemplate)
throw (com::sun::star::uno::RuntimeException);
}
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 3d45c7f..45cdb42 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -849,8 +849,7 @@ void UniversalContentBroker::prepareAndRegister(
m_xContext,
aIt->ServiceName,
aProviderArguments,
- aIt->URLTemplate,
- 0);
+ aIt->URLTemplate);
}
else
diff --git a/ucbhelper/source/provider/registerucb.cxx
b/ucbhelper/source/provider/registerucb.cxx
index a17e0ad..bce135f 100644
--- a/ucbhelper/source/provider/registerucb.cxx
+++ b/ucbhelper/source/provider/registerucb.cxx
@@ -45,8 +45,7 @@ registerAtUcb(
uno::Reference< uno::XComponentContext > const & rxContext,
OUString const & rName,
OUString const & rArguments,
-OUString const & rTemplate,
-ContentProviderRegistrationInfo * pInfo)
+OUString const & rTemplate)
throw (uno::RuntimeException)
{
OSL_ENSURE(rxContext.is(),
@@ -85,8 +84,6 @@ registerAtUcb(
catch (uno::RuntimeException const &) { throw; }
catch (uno::Exception const &) {}
-uno::Reference< ucb::XContentProvider >
-xOriginalProvider(xProvider);
uno::Reference< ucb::XParameterizedContentProvider >
xParameterized(xProvider, uno::UNO_QUERY);
if (xParameterized.is())
@@ -137,12 +134,6 @@ registerAtUcb(
throw;
}
}
-if (bSuccess && pInfo)
-{
-pInfo->m_xProvider = xOriginalProvider;
-pInfo->m_aArguments = aProviderArguments;
-pInfo->m_aTemplate = rTemplate;
-}
return bSuccess;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - i18npool/source
i18npool/source/breakiterator/breakiterator_unicode.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9a47b6a3727ff6153b129058a220e93e0d60
Author: Elie Roux
Date: Wed May 29 09:58:17 2013 +0200
fdo#64926 use icu's breakiterator for Tibetan and Dzongkha
Change-Id: I78010e216eb1582fa5074666f36c95f5b0eceee5
Reviewed-on: https://gerrit.libreoffice.org/4082
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 878b09a1a936c2d5bf4461e0123fafd377d948e2)
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 620bba1..549abd1 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -120,7 +120,8 @@ void SAL_CALL
BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
rbi = new OOoRuleBasedBreakIterator(udata_open("OpenOffice",
"brk",
OUStringToOString(breakRules[breakType],
RTL_TEXTENCODING_ASCII_US).getStr(), &status), status);
}
-else if (rLocale.Language != "th" && rLocale.Language != "km")
//use icu's breakiterator for Thai and Khmer
+//use icu's breakiterator for Thai, Khmer, Tibetan and Dzongkha
+else if (rLocale.Language != "th" && rLocale.Language != "km" &&
rLocale.Language != "bo" && rLocale.Language != "dz")
{
status = U_ZERO_ERROR;
OStringBuffer aUDName(64);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/misc/mediadescriptor.cxx | 17 +++--
1 file changed, 3 insertions(+), 14 deletions(-)
New commits:
commit 940dba6b0f13df4c7a42265cf52fec6ba6055c5a
Author: Stephan Bergmann
Date: Fri Jun 14 11:35:23 2013 +0200
Some clean up
Change-Id: Ie8f8b4fe48a94cd760fa85cc83121c4ab0f3b507
diff --git a/comphelper/source/misc/mediadescriptor.cxx
b/comphelper/source/misc/mediadescriptor.cxx
index 586f6fc..f3bc92f 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -45,9 +45,6 @@
#include
#include
-#include
-
-
namespace comphelper{
const OUString& MediaDescriptor::PROP_ABORTED()
@@ -473,20 +470,12 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool
bLockFile )
OUString sNormalizedURL = impl_normalizeURL( sURL );
return impl_openStreamWithURL( sNormalizedURL, bLockFile );
}
-#if OSL_DEBUG_LEVEL > 0
catch(const css::uno::Exception& ex)
{
-OUStringBuffer sMsg(256);
-sMsg.appendAscii("Invalid MediaDescriptor detected:\n");
-sMsg.append (ex.Message );
-OSL_FAIL(OUStringToOString(sMsg.makeStringAndClear(),
RTL_TEXTENCODING_UTF8).getStr());
+SAL_WARN(
+"comphelper", "invalid MediaDescriptor detected: " << ex.Message);
+return false;
}
-#else
-catch(const css::uno::Exception&)
-{}
-#endif
-
-return sal_False;
}
sal_Bool MediaDescriptor::impl_openStreamWithPostData( const
css::uno::Reference< css::io::XInputStream >& _rxPostData )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/gio/gio_content.cxx | 42 ++---
1 file changed, 26 insertions(+), 16 deletions(-)
New commits:
commit 4d8bf09305fc4e4bd652187aac0a02398413ba65
Author: Stephan Bergmann
Date: Fri Jun 14 11:22:51 2013 +0200
Always try to mount in gio::Content::getGFileInfo
...and not only if the caller happens to pass in non-null ppError.
Otherwise,
calling soffice with a document URL handled by the gio UCP that is not yet
gio-mounted would silently do nothing and exit with EXIT_SUCCESS, as the
first
thing the type detection code does on the URL is execute
"getPropertyValues" for
"IsDocument", which calls getGFileInfo with null ppError, so a void instead
of a
boolean value is returned, which then derails the type detection code to
silently fail (which is another problem that needs fixing).
Change-Id: I48a84428cdee5caead02909abc2efd3ae3722052
diff --git a/ucb/source/ucp/gio/gio_content.cxx
b/ucb/source/ucp/gio/gio_content.cxx
index 06e3920..a9dd6e8 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -337,25 +337,35 @@ MountOperation::~MountOperation()
GFileInfo* Content::getGFileInfo(const uno::Reference<
ucb::XCommandEnvironment >& xEnv, GError **ppError)
{
-/*If we don't have it already, and we're not a "pre-creation" content then
query for the info"*/
-if (!mpInfo && !mbTransient)
-{
-if (!(mpInfo = g_file_query_info(getGFile(), "*",
G_FILE_QUERY_INFO_NONE, NULL, ppError)))
-{
-//Try and mount if unmounted
-if (ppError && (*ppError)->code == G_IO_ERROR_NOT_MOUNTED)
-{
-g_error_free(*ppError);
-
-MountOperation aMounter(xEnv);
-*ppError = aMounter.Mount(getGFile());
-
-//No Mount error, reattempt query
-if (!*ppError)
-mpInfo = g_file_query_info(getGFile(), "*",
G_FILE_QUERY_INFO_NONE, NULL, ppError);
+GError * err = 0;
+if (mpInfo == 0 && !mbTransient) {
+for (bool retried = false;; retried = true) {
+mpInfo = g_file_query_info(
+getGFile(), "*", G_FILE_QUERY_INFO_NONE, 0, &err);
+if (mpInfo != 0) {
+break;
+}
+assert(err != 0);
+if (err->code != G_IO_ERROR_NOT_MOUNTED || retried) {
+break;
+}
+SAL_INFO(
+"ucb.ucp.gio",
+"G_IO_ERROR_NOT_MOUNTED \"" << err->message
+<< "\", trying to mount");
+g_error_free(err);
+err = MountOperation(xEnv).Mount(getGFile());
+if (err != 0) {
+break;
}
}
}
+if (ppError != 0) {
+*ppError = err;
+} else if (err != 0) {
+SAL_WARN("ucb.ucp.gio", "ignoring GError \"" << err->message << "\"");
+g_error_free(err);
+}
return mpInfo;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ABANDONED] String=>OUString clean-up header include in tools and misc t...
Norbert Thiebaud has abandoned this change. Change subject: String=>OUString clean-up header include in tools and misc touch-up .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4265 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I8c2220e21c58739ea41702101e0d533dc56f1208 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String=>OUString svl touch-up
Norbert Thiebaud has abandoned this change. Change subject: String=>OUString svl touch-up .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4266 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Iaab1e0a2fdbfdac9d66fe158fca397336c6e84d1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String=>OUString svtools trasnfer*
Norbert Thiebaud has abandoned this change. Change subject: String=>OUString svtools trasnfer* .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4262 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Iefa6688b91a05e248a6073c4f7216111fa4f7410 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String=OUString part of linguistic
Norbert Thiebaud has abandoned this change. Change subject: String=OUString part of linguistic .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4263 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I8e566956416bb191a4d28acb6c3dc2c1e1daad62 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String=>OUString svtools inetimg
Norbert Thiebaud has abandoned this change. Change subject: String=>OUString svtools inetimg .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4259 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Id986014e3b2897478427a072be582581d3791101 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
REMINDER: Release 4.1.0.1 from libreoffice-4-1 branch (Hard English string & UI freeze)
Hi, please note that the commit deadline for 4.1.0.1, aka rc1, is on Monday, June 17, 2013. It is also the day for the hard English sting and UI freeze. IMPORTANT: we are reaching the final phase, so all changes in the 4-1 branch will need one review after the rc1 deadline. By other words, the reviewing requirement starts on Tuesday, June 18, 2013. Note that there are planned two more release candidates with deadlines on July 1, and 15, 2013. See also https://wiki.documentfoundation.org/ReleasePlan/4.1#4.1.0_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String=>OUString svtools grfmgr + fmtfield
Norbert Thiebaud has abandoned this change. Change subject: String=>OUString svtools grfmgr + fmtfield .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4261 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ie3d49014cb5edfbb709bea97b6f1332351fc6f3c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String=>OUString svtools imap
Norbert Thiebaud has abandoned this change. Change subject: String=>OUString svtools imap .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4258 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I56a91943080e290eabbc23575e27aab65e5d269e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String=>OUString yet another random batch starting from svto...
Norbert Thiebaud has abandoned this change. Change subject: String=>OUString yet another random batch starting from svtools .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4260 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ib96e44732db8d9172bf1f804a20281343766ed33 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String=>OUString svtools/fileview and dep
Norbert Thiebaud has abandoned this change. Change subject: String=>OUString svtools/fileview and dep .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4255 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: If813b3099df9e98c07f40aecdd23fe547cbd0f44 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String=>OUString virtual getStateDisplayName
Norbert Thiebaud has abandoned this change. Change subject: String=>OUString virtual getStateDisplayName .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4257 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I14263ef9acc64f7738e0532ed8425db30ac5e890 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String=>OUString : svtools inettbc
Norbert Thiebaud has abandoned this change. Change subject: String=>OUString : svtools inettbc .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4256 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I457834f2c7eef221db97387410115600748f1375 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String=>OUString another daily wack at it
Norbert Thiebaud has abandoned this change. Change subject: String=>OUString another daily wack at it .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4254 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I49f0aeb4e97718428ab0b87c659da14fe30dab2e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String=>OUString big chunk of paring related code
Norbert Thiebaud has abandoned this change. Change subject: String=>OUString big chunk of paring related code .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4253 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I65d84991291fb2ade03132d424ed833a89bbc430 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String=>OUString svl ddedummy
Norbert Thiebaud has abandoned this change. Change subject: String=>OUString svl ddedummy .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4252 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: If502fbf8aac64a1776a64713babf3c0549d2cf76 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String=>OUString and sal_Bool=>bool for the module sot
Norbert Thiebaud has abandoned this change. Change subject: String=>OUString and sal_Bool=>bool for the module sot .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4250 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ie5a88609722fba861b52e9530e8f7e83dee57f4b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String=>OUString in svl
Norbert Thiebaud has abandoned this change. Change subject: String=>OUString in svl .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4251 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ie1cc02f168f5977b953fc13590da17f8b12513f6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] Strin->OUString unotools textsearch and dep
Norbert Thiebaud has abandoned this change. Change subject: Strin->OUString unotools textsearch and dep .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4249 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I1934ba31b966ee79f10e200c37c8db4924272cb4 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] String->OUString more unotools
Norbert Thiebaud has abandoned this change. Change subject: String->OUString more unotools .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/4248 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I50f61d62b6b1dc348a0253e94b7e334baaec2bb0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
