[Libreoffice-commits] online.git: loleaflet/dist loleaflet/src
loleaflet/dist/loleaflet-help.html|1 +
loleaflet/src/map/handler/Map.Keyboard.js |6 ++
2 files changed, 7 insertions(+)
New commits:
commit 73cf6f71fbe1ccb1946958b06e8deab16176a82c
Author: Henry Castro
Date: Fri Jan 6 23:11:48 2017 -0400
tdf#103779: Help menu accessibility, part 2
Add a keyboard shortcut ctrl + h to display the
Keyboard shortcuts help
diff --git a/loleaflet/dist/loleaflet-help.html
b/loleaflet/dist/loleaflet-help.html
index 2184635..bfed701 100644
--- a/loleaflet/dist/loleaflet-help.html
+++ b/loleaflet/dist/loleaflet-help.html
@@ -31,6 +31,7 @@
Cut Ctrl +
X
Paste as unformatted text Ctrl + Alt + Shift + V
Print (Download as PDF) Ctrl + P
+ Display the Keyboard shortcuts help
Ctrl + H
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js
b/loleaflet/src/map/handler/Map.Keyboard.js
index 84c72d3..77302a8 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -398,6 +398,12 @@ L.Map.Keyboard = L.Handler.extend({
e.originalEvent.preventDefault();
}
+ if (e.originalEvent.ctrlKey && (e.originalEvent.key === 'h' ||
e.originalEvent.key === 'H')) {
+ map.showLOKeyboardHelp();
+ e.originalEvent.preventDefault();
+ return true;
+ }
+
if (e.originalEvent.ctrlKey && (e.originalEvent.key === 'z' ||
e.originalEvent.key === 'Z')) {
this._map._socket.sendMessage('uno .uno:Undo');
e.originalEvent.preventDefault();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl svtools/source vcl/source
include/vcl/outdev.hxx |1 +
svtools/source/control/ctrltool.cxx |9 -
vcl/source/outdev/font.cxx |5 +
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 0ad4b2570f06aa014f8446757931afa1f2305458
Author: Henry Castro
Date: Fri Dec 16 23:23:31 2016 -0400
lok: refill font list if empty
After preinit stage the font list is empty
when creating documents.
Reviewed-on: https://gerrit.libreoffice.org/32108
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
Conflicts:
sd/source/ui/docshell/docshel4.cxx
svtools/source/control/ctrltool.cxx
Change-Id: Ia6938d521626f4b4022f0f993e77c017e4932415
Reviewed-on: https://gerrit.libreoffice.org/32796
Tested-by: Jenkins
Reviewed-by: Henry Castro
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index a2130e0..2e7a5ae 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1211,6 +1211,7 @@ public:
int GetDevFontSizeCount( const vcl::Font& ) const;
boolAddTempDevFont( const OUString& rFileURL,
const OUString& rFontName );
+voidRefreshFontData( const bool bNewFontLists );
FontMetric GetFontMetric() const;
FontMetric GetFontMetric( const vcl::Font& rFont ) const;
diff --git a/svtools/source/control/ctrltool.cxx
b/svtools/source/control/ctrltool.cxx
index fdbd04b..4a31b22 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
// Standard Fontgroessen fuer scalierbare Fonts
const sal_IntPtr FontList::aStdSizeAry[] =
@@ -248,7 +249,13 @@ void FontList::ImplInsertFonts(OutputDevice* pDevice, bool
bInsertData)
nType = FontListFontNameType::PRINTER;
// inquire all fonts from the device
-int const n = pDevice->GetDevFontCount();
+int n = pDevice->GetDevFontCount();
+if (n == 0 && comphelper::LibreOfficeKit::isActive())
+{
+pDevice->RefreshFontData(true);
+n = pDevice->GetDevFontCount();
+}
+
for (int i = 0; i < n; ++i)
{
FontMetric aFontMetric = pDevice->GetDevFont( i );
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index eba3374..572ac67 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -548,6 +548,11 @@ void OutputDevice::ImplClearFontData( const bool
bNewFontLists )
}
}
+void OutputDevice::RefreshFontData( const bool bNewFontLists )
+{
+ImplRefreshFontData( bNewFontLists );
+}
+
void OutputDevice::ImplRefreshFontData( const bool bNewFontLists )
{
//if ( GetOutDevType() == OUTDEV_PRINTER || mpPDFWriter )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - basegfx/source basegfx/test include/basegfx sw/source
basegfx/source/color/bcolortools.cxx | 11 ---
basegfx/test/basegfx2d.cxx| 13 -
include/basegfx/color/bcolortools.hxx |4
sw/source/core/draw/dcontact.cxx |6 +++---
4 files changed, 3 insertions(+), 31 deletions(-)
New commits:
commit 6af9609284e33c9a8501cbda9ef4c82f30a16b41
Author: Caolán McNamara
Date: Fri Jan 6 20:31:49 2017 +
coverity#1398369 Unchecked dynamic_cast
Change-Id: I33b5a2343eb7701a478c8d039d818e679471d4c0
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 06e9f66..c0755c0 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -587,7 +587,7 @@ void SwFlyDrawContact::SwClientNotify(const SwModify& rMod,
const SfxHint& rHint
// This also needs to work when no layout exists. Thus, for
// FlyFrames an alternative method is used now in that case.
auto pFormat(dynamic_cast(&rMod));
-if(pFormat->Which() == RES_FLYFRMFMT &&
!pFormat->getIDocumentLayoutAccess().GetCurrentViewShell())
+if (pFormat && pFormat->Which() == RES_FLYFRMFMT &&
!pFormat->getIDocumentLayoutAccess().GetCurrentViewShell())
pGetZOrdnerHint->m_rnZOrder = GetMaster()->GetOrdNum();
}
}
@@ -598,9 +598,9 @@ bool CheckControlLayer( const SdrObject *pObj )
{
if ( SdrInventor::FmForm == pObj->GetObjInventor() )
return true;
-if (const SdrObjList *pObjLst = dynamic_cast(pObj))
+if (const SdrObjGroup *pObjGroup = dynamic_cast(pObj))
{
-const SdrObjList *pLst = pObjLst->GetSubList();
+const SdrObjList *pLst = pObjGroup->GetSubList();
for ( size_t i = 0; i < pLst->GetObjCount(); ++i )
{
if ( ::CheckControlLayer( pLst->GetObj( i ) ) )
commit fb92ec82caa96f2ddf4ab4bca8c51503ae9fba82
Author: Caolán McNamara
Date: Fri Jan 6 20:28:49 2017 +
dynamic cast followed by static cast
Change-Id: I425692130bd7ef6b8a9ebce3592c1976fa44dafc
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 977841b..06e9f66 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -598,9 +598,9 @@ bool CheckControlLayer( const SdrObject *pObj )
{
if ( SdrInventor::FmForm == pObj->GetObjInventor() )
return true;
-if ( dynamic_cast( pObj) != nullptr )
+if (const SdrObjList *pObjLst = dynamic_cast(pObj))
{
-const SdrObjList *pLst = static_cast(pObj)->GetSubList();
+const SdrObjList *pLst = pObjLst->GetSubList();
for ( size_t i = 0; i < pLst->GetObjCount(); ++i )
{
if ( ::CheckControlLayer( pLst->GetObj( i ) ) )
commit 9e7ff6a7e4415ce18b7a68c857bdb86f142a8e5d
Author: Caolán McNamara
Date: Fri Jan 6 20:36:56 2017 +
coverity#1398371 Useless call
Change-Id: I3614bb162cec889ee102e0284b6a3a33a98df470
diff --git a/basegfx/source/color/bcolortools.cxx
b/basegfx/source/color/bcolortools.cxx
index 7e139ac..095ea50 100644
--- a/basegfx/source/color/bcolortools.cxx
+++ b/basegfx/source/color/bcolortools.cxx
@@ -189,17 +189,6 @@ namespace basegfx { namespace tools
}
}
-BColor rgb2ciexyz( const BColor& rRGBColor )
-{
-// from Poynton color faq, and SMPTE RP 177-1993, Derivation
-// of Basic Television Color Equations
-const double r=rRGBColor.getRed(), g=rRGBColor.getGreen(),
b=rRGBColor.getBlue();
-return BColor(
-0.412453*r + 0.35758*g + 0.180423*b,
-0.212671*r + 0.71516*g + 0.072169*b,
-0.019334*r + 0.119193*g + 0.950227*b);
-}
-
} } // end of namespace basegfx
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 502f784..b0b27ef 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -1211,18 +1211,6 @@ public:
tools::rgb2hsv(BColor(.5,.25,.25)) ==
BColor(0,.5,.5));
}
-void ciexyzTest()
-{
-tools::rgb2ciexyz(maWhite);
-tools::rgb2ciexyz(maBlack);
-tools::rgb2ciexyz(maRed);
-tools::rgb2ciexyz(maGreen);
-tools::rgb2ciexyz(maBlue);
-tools::rgb2ciexyz(maYellow);
-tools::rgb2ciexyz(maMagenta);
-tools::rgb2ciexyz(maCyan);
-}
-
// Change the following lines only, if you add, remove or rename
// member functions of the current class,
// because these macros are need by auto register mechanism.
@@ -1230,7 +1218,6 @@ public:
CPPUNIT_TEST_SUITE(bcolor);
CPPUNIT_TEST(hslTest);
CPPUNIT_TEST(hsvTest);
-CPPUNIT_TEST(ciexyzTest);
CPPUNIT_TEST_SUITE_END();
}; // class b2dvector
diff --git a/include/basegfx/color/bcolortools.hxx
b/include/basegfx/color/bcolortools.hxx
index 2f4222f..64cdc95 100644
--- a/include/basegfx/color/bcolortools.hxx
+++ b/include/basegfx/color/bcolortools.hxx
@
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/helper/accessiblestrings.hrc| 23 +-
accessibility/source/extended/accessibleeditbrowseboxcell.cxx |7 ++-
accessibility/source/helper/accessiblestrings.src | 10
3 files changed, 28 insertions(+), 12 deletions(-)
New commits:
commit 92a1ad1f36b6d3cc13135a8c0805508933011577
Author: Muhammet Kara
Date: Tue Dec 27 00:04:44 2016 +0200
Localize return value of EditBrowseBoxTableCell::getAccessibleName
Change-Id: I040c1b9b8680a366819254e1d44b80115a339bbf
Reviewed-on: https://gerrit.libreoffice.org/32441
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/accessibility/inc/helper/accessiblestrings.hrc
b/accessibility/inc/helper/accessiblestrings.hrc
index 60c4392..f957ab9 100644
--- a/accessibility/inc/helper/accessiblestrings.hrc
+++ b/accessibility/inc/helper/accessiblestrings.hrc
@@ -30,21 +30,24 @@
#define RID_STR_ACC_ACTION_DECLINE ( RID_TK_ACC_START +4 )
#define RID_STR_ACC_ACTION_INCBLOCK ( RID_TK_ACC_START +5 )
#define RID_STR_ACC_ACTION_DECBLOCK ( RID_TK_ACC_START +6 )
-#define RID_STR_ACC_NAME_PREVIEW( RID_TK_ACC_START +7 )
+#define RID_STR_ACC_NAME_PREVIEW( RID_TK_ACC_START +7 )
#define STR_SVT_ACC_ACTION_EXPAND ( RID_TK_ACC_START +8 )
#define STR_SVT_ACC_ACTION_COLLAPSE ( RID_TK_ACC_START +9 )
-#define STR_SVT_ACC_LISTENTRY_SELCTED_STATE ( RID_TK_ACC_START +10 )
+#define STR_SVT_ACC_LISTENTRY_SELCTED_STATE ( RID_TK_ACC_START + 10 )
-#define RID_STR_ACC_ACTION_CHECK( RID_TK_ACC_START +11 )
-#define RID_STR_ACC_ACTION_UNCHECK ( RID_TK_ACC_START +12 )
-#define RID_STR_ACC_ACTION_DOUBLE_CLICK ( RID_TK_ACC_START +13 )
-#define RID_STR_ACC_SCROLLBAR_NAME_VERTICAL ( RID_TK_ACC_START +14 )
-#define RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL ( RID_TK_ACC_START +15
)
-#define RID_STR_ACC_PANEL_DESCRIPTION ( RID_TK_ACC_START +16 )
+#define RID_STR_ACC_ACTION_CHECK( RID_TK_ACC_START + 11 )
+#define RID_STR_ACC_ACTION_UNCHECK ( RID_TK_ACC_START + 12 )
+#define RID_STR_ACC_ACTION_DOUBLE_CLICK ( RID_TK_ACC_START + 13 )
+#define RID_STR_ACC_SCROLLBAR_NAME_VERTICAL ( RID_TK_ACC_START + 14 )
+#define RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL ( RID_TK_ACC_START + 15 )
+#define RID_STR_ACC_PANEL_DESCRIPTION ( RID_TK_ACC_START + 16 )
-#define RID_STR_ACC_NAME_BROWSEBUTTON ( RID_TK_ACC_START + 100 )
-#define RID_STR_ACC_DESC_PANELDECL_TABBAR ( RID_TK_ACC_START + 101 )
+#define RID_STR_ACC_COLUMN_NUM ( RID_TK_ACC_START + 17 )
+#define RID_STR_ACC_ROW_NUM ( RID_TK_ACC_START + 18 )
+
+#define RID_STR_ACC_NAME_BROWSEBUTTON ( RID_TK_ACC_START + 100 )
+#define RID_STR_ACC_DESC_PANELDECL_TABBAR ( RID_TK_ACC_START + 101 )
#endif // ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index 7344acf..d816176 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+#include
+
#include
#include
#include
@@ -103,8 +106,8 @@ namespace accessibility
{
SolarMethodGuard aGuard( *this );
-// TODO: localize this!
-return "Column " + OUString::number(getColumnPos()-1) + ", Row " +
OUString::number(getRowPos());
+return
TK_RES_STRING(RID_STR_ACC_COLUMN_NUM).replaceAll("%COLUMNNUMBER",
OUString::number(getColumnPos()-1)) + ", "
+ + TK_RES_STRING(RID_STR_ACC_ROW_NUM).replaceAll("%ROWNUMBER",
OUString::number(getRowPos()));
}
css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL
EditBrowseBoxTableCell::getAccessibleRelationSet() throw ( RuntimeException,
std::exception )
diff --git a/accessibility/source/helper/accessiblestrings.src
b/accessibility/source/helper/accessiblestrings.src
index 63e3067..1a82275 100644
--- a/accessibility/source/helper/accessiblestrings.src
+++ b/accessibility/source/helper/accessiblestrings.src
@@ -106,6 +106,16 @@ String RID_STR_ACC_PANEL_DESCRIPTION
Text [ en-US ] = "Please press enter to go into child control for more
operations";
};
+String RID_STR_ACC_COLUMN_NUM
+{
+Text [ en-US ] = "Column %COLUMNNUMBER";
+};
+
+String RID_STR_ACC_ROW_NUM
+{
+Text [ en-US ] = "Row %ROWNUMBER";
+};
+
String RID_STR_ACC_DESC_PANELDECL_TABBAR
{
Text [ en-US ] = "Panel Deck Tab Bar";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/6b89bcf85a911d043c9d93e843be12e6f23adedd/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Bug TDF#99097 - Call for reflection
Encoding of "N" and "NN" in StarBasic : /libreoffice/basic/source/sbx/sbxscan.cxx a) #define in lines 654 and 655. b) Interpretation of "N" and "NN" in lines 743 to 754. Hum. H and HH code for hours. There is a risk of confusion. I understand the difficulty of reassigning the N and NN codes. So why not go with two new codes? I propose I and II (second letter in the word Minute ...). Pierre Le 2017-01-06 à 14:58, Eike Rathke a écrit : Hi Pierre, On Friday, 2016-12-30 06:24:27 -0500, Pierre Lepage wrote: StarBasic encodes "N" and "NN" as formats different from those of LO, but similar to VBA, ie "N" for minutes without 0 in prefix and "NN" for minutes With 0 in prefix. Where does it do that? Could you provide a code pointer please? The first solution appears as a crutch. Coding for an exception will not resolve the source of confusion. Nevertheless, if this solution were to be implemented, the algorithm would have to distinguish between two situations of the codes: a) the codes are embedded in a time format string only in which case the interpretation of the N and NN codes would be in conformity To VBA, that is to say that N would code for minutes without 0 in prefix and NN would code for minutes with 0 in prefix; B) otherwise the codes would be interpreted as they are now, ie NN would code for the abbreviation of the name of the day and N would be ignored. I'd refrain from such diversion in the number formatter code.. The second solution appears more robust. The confusion would be definitively eliminated. It remains that the historical reason behind the choice of the letters NN and NNN rather than exclusively DDD and to codify an abbreviated and long day format is unknown to me. It is therefore possible that old files based on the current interpretation of the NN, NNN and codes will require corrections to rely solely on the DDD and codes. Which also is not easily possible, because documents may use format codes relying on the behavior, even worse use such format codes in Calc's TEXT() spreadsheet function as argument. I included a Calc file summarizing the format codes for dates and time. The first tab is the current situation. The second tab is for the situation once the second solution is implemented. So, before going any further, I need to know the desired orientation for LibreOffice. I'd change the StarBasic code to pass on modified format codes, H for N and HH for NN. Eike ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - download.lst sw/source
download.lst|3 ---
sw/source/core/access/accfrmobj.cxx | 12
2 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit ade1d4c36053c2a7aed959e3dd09ebc1b8430ea8
Author: Michael Stahl
Date: Fri Jan 6 22:37:17 2017 +0100
tdf#105009 sw: fix a11y crash when removing drawing object
SwFrame::RemoveDrawObj() calls SwAnchoredObject::ChgAnchorFrame(0)
so the SwAnchoredDrawObj has no anchor frame later when
SwAccessibleMap::InvalidateCursorPosition() asks for the parent.
(regression from 76c549eb01dcb7b5bf28a271ce00e386f3d388ba)
Change-Id: Id55cb5fc41a4e37e863498265d1565e1621d508e
diff --git a/sw/source/core/access/accfrmobj.cxx
b/sw/source/core/access/accfrmobj.cxx
index 3c6b3e5..9c8d515 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -379,10 +379,14 @@ const SwFrame* SwAccessibleChild::GetParent( const bool
bInPagePreview ) const
else
{
// In any other case the parent is the root frm
-if( bInPagePreview )
-pParent = pContact->GetAnchorFrame()->FindPageFrame();
-else
-pParent = pContact->GetAnchorFrame()->getRootFrame();
+SwFrame const*const pAnchor(pContact->GetAnchorFrame());
+if (pAnchor) // null if object removed from layout
+{
+if (bInPagePreview)
+pParent = pAnchor->FindPageFrame();
+else
+pParent = pAnchor->getRootFrame();
+}
}
}
}
commit 2f1cf69153593ba61da672be72eb2ff4a5a7dad8
Author: Michael Stahl
Date: Fri Jan 6 21:05:57 2017 +0100
remove obsolete MOZ_ZIP_* variables
Change-Id: Ie83ff9e50534536326c78de1b6b717fe18b6dae1
diff --git a/download.lst b/download.lst
index 52b5210..c28b972 100644
--- a/download.lst
+++ b/download.lst
@@ -175,6 +175,3 @@ export ZLIB_TARBALL := zlib-1.2.8.tar.gz
export ZMF_MD5SUM := c611df8664240de0276ab95670f413d8
export ZMF_TARBALL := libzmf-0.0.1.tar.bz2
-export MOZ_ZIP_INC := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)inc.zip
-export MOZ_ZIP_LIB := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)lib.zip
-export MOZ_ZIP_RUNTIME := $(OS)$(COM)$(if $(filter
INTEL,$(CPUNAME)),I,X)runtime.zip
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/print.cxx | 34 +++---
1 file changed, 11 insertions(+), 23 deletions(-)
New commits:
commit 6b737072279b137b0224a3bbe48907621a36f434
Author: Khaled Hosny
Date: Fri Jan 6 02:00:06 2017 +0200
Drop macros that are used only once
Change-Id: Ib75c0db614448f5297de9924335e2ee9f71f3a3f
Reviewed-on: https://gerrit.libreoffice.org/32766
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index a0b9218..50bc4ad 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -106,18 +106,6 @@ PrinterOptions::~PrinterOptions()
{
}
-#define PROPERTYNAME_REDUCETRANSPARENCY "ReduceTransparency"
-#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE
"ReducedTransparencyMode"
-#define PROPERTYNAME_REDUCEGRADIENTS"ReduceGradients"
-#define PROPERTYNAME_REDUCEDGRADIENTMODE"ReducedGradientMode"
-#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT
"ReducedGradientStepCount"
-#define PROPERTYNAME_REDUCEBITMAPS "ReduceBitmaps"
-#define PROPERTYNAME_REDUCEDBITMAPMODE "ReducedBitmapMode"
-#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION
"ReducedBitmapResolution"
-#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY
"ReducedBitmapIncludesTransparency"
-#define PROPERTYNAME_CONVERTTOGREYSCALES"ConvertToGreyscales"
-#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT
"PDFAsStandardPrintJobFormat"
-
bool PrinterOptions::ReadFromConfig( bool i_bFile )
{
bool bSuccess = false;
@@ -155,27 +143,27 @@ bool PrinterOptions::ReadFromConfig( bool i_bFile )
{
sal_Int32 nValue = 0;
bool bValue = false;
-if(
xSet->getPropertyValue(PROPERTYNAME_REDUCETRANSPARENCY) >>= bValue )
+if( xSet->getPropertyValue("ReduceTransparency") >>=
bValue )
SetReduceTransparency( bValue );
-if(
xSet->getPropertyValue(PROPERTYNAME_REDUCEDTRANSPARENCYMODE) >>= nValue )
+if( xSet->getPropertyValue("ReducedTransparencyMode") >>=
nValue )
SetReducedTransparencyMode(
(PrinterTransparencyMode)nValue );
-if( xSet->getPropertyValue(PROPERTYNAME_REDUCEGRADIENTS)
>>= bValue )
+if( xSet->getPropertyValue("ReduceGradients") >>= bValue )
SetReduceGradients( bValue );
-if(
xSet->getPropertyValue(PROPERTYNAME_REDUCEDGRADIENTMODE) >>= nValue )
+if( xSet->getPropertyValue("ReducedGradientMode") >>=
nValue )
SetReducedGradientMode( (PrinterGradientMode)nValue );
-if(
xSet->getPropertyValue(PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT) >>= nValue )
+if( xSet->getPropertyValue("ReducedGradientStepCount") >>=
nValue )
SetReducedGradientStepCount( (sal_uInt16)nValue );
-if( xSet->getPropertyValue(PROPERTYNAME_REDUCEBITMAPS) >>=
bValue )
+if( xSet->getPropertyValue("ReduceBitmaps") >>= bValue )
SetReduceBitmaps( bValue );
-if( xSet->getPropertyValue(PROPERTYNAME_REDUCEDBITMAPMODE)
>>= nValue )
+if( xSet->getPropertyValue("ReducedBitmapMode") >>= nValue
)
SetReducedBitmapMode( (PrinterBitmapMode)nValue );
-if(
xSet->getPropertyValue(PROPERTYNAME_REDUCEDBITMAPRESOLUTION) >>= nValue )
+if( xSet->getPropertyValue("ReducedBitmapResolution") >>=
nValue )
SetReducedBitmapResolution( (sal_uInt16)nValue );
-if(
xSet->getPropertyValue(PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY) >>=
bValue )
+if(
xSet->getPropertyValue("ReducedBitmapIncludesTransparency") >>= bValue )
SetReducedBitmapIncludesTransparency( bValue );
-if(
xSet->getPropertyValue(PROPERTYNAME_CONVERTTOGREYSCALES) >>= bValue )
+if( xSet->getPropertyValue("ConvertToGreyscales") >>=
bValue )
SetConvertToGreyscales( bValue );
-if(
xSet->getPropertyValue(PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT) >>= bValue )
+if( xSet->getPropertyValue("PDFAsStandardPrintJobFormat")
>>= bValue )
SetPDFAsStandardPrintJobFormat( bValue );
bSuccess = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/app.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit baa99b4e3a466495d0fa8fdef313230eec44c9ce
Author: Markus Mohrhard
Date: Thu Jan 5 22:35:52 2017 +0100
add the locale info to the crashreporter metadata
We have a few crashes that seem locale dependent. Especially the font
related problems.
Change-Id: I0cc977413dc2328ea705c96c2d4048e4f3c58bbc
Reviewed-on: https://gerrit.libreoffice.org/32764
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 437ff51..90ace3c 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2166,6 +2166,8 @@ void Desktop::OpenClients()
}
#if HAVE_FEATURE_BREAKPAD
CrashReporter::writeCommonInfo();
+// write this information here to avoid depending on vcl in the crash
reporter lib
+CrashReporter::AddKeyValue("Language",
Application::GetSettings().GetLanguageTag().getBcp47());
#endif
RequestHandler::EnableRequests();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/headless
vcl/headless/svpbmp.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a6b6980afa443b3d317de5f24d993f939073d73a
Author: Caolán McNamara
Date: Fri Jan 6 20:54:19 2017 +
oss-fuzz: make max sane bitmap allocation smaller
Change-Id: I0b924f615ed4652ce605c12d2d2e9ca2ad2befbf
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index d11f3b9..ee5a983 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -122,7 +122,7 @@ BitmapBuffer* ImplCreateDIB(
}
const size_t size = pDIB->mnScanlineSize * pDIB->mnHeight;
-if (size > SAL_MAX_INT32)
+if (size > SAL_MAX_INT32/2)
{
delete pDIB;
return nullptr;
@@ -178,7 +178,7 @@ bool SvpSalBitmap::Create(const SalBitmap& rBmp)
mpDIB = new BitmapBuffer( *rSalBmp.mpDIB );
const size_t size = mpDIB->mnScanlineSize * mpDIB->mnHeight;
-if (size > SAL_MAX_INT32)
+if (size > SAL_MAX_INT32/2)
{
delete mpDIB;
mpDIB = nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
3 new defect(s) introduced to LibreOffice found with Coverity Scan.
13 defect(s), reported by Coverity Scan earlier, were marked fixed in the
recent build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 3 of 3 defect(s)
** CID 1398371: Incorrect expression (USELESS_CALL)
/basegfx/test/basegfx2d.cxx: 1223 in basegfx2d::bcolor::ciexyzTest()()
*** CID 1398371: Incorrect expression (USELESS_CALL)
/basegfx/test/basegfx2d.cxx: 1223 in basegfx2d::bcolor::ciexyzTest()()
1217 tools::rgb2ciexyz(maBlack);
1218 tools::rgb2ciexyz(maRed);
1219 tools::rgb2ciexyz(maGreen);
1220 tools::rgb2ciexyz(maBlue);
1221 tools::rgb2ciexyz(maYellow);
1222 tools::rgb2ciexyz(maMagenta);
>>> CID 1398371: Incorrect expression (USELESS_CALL)
>>> Calling "basegfx::tools::rgb2ciexyz(this->maCyan)" is only useful for
>>> its return value, which is ignored.
1223 tools::rgb2ciexyz(maCyan);
1224 }
1225
1226 // Change the following lines only, if you add, remove or rename
1227 // member functions of the current class,
1228 // because these macros are need by auto register mechanism.
** CID 1398370: Memory - corruptions (OVERRUN)
/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx: 386 in
TiledRowColumnBar::docConfigureEvent(_GtkWidget *, _GdkEventConfigure *, void
*)()
*** CID 1398370: Memory - corruptions (OVERRUN)
/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx: 386 in
TiledRowColumnBar::docConfigureEvent(_GtkWidget *, _GdkEventConfigure *, void
*)()
380 "\"HorizontalAlignment\":{"
381 "\"type\":\"unsigned short\", "
382 "\"value\":\"%d\""
383 "}"
384 "}";
385
>>> CID 1398370: Memory - corruptions (OVERRUN)
>>> Allocating insufficient memory for the terminating null of the string.
386 char unoHorAlignArgsFormatted[strlen(unoHorAlignArgs)];
387 snprintf(unoHorAlignArgsFormatted,
sizeof(unoHorAlignArgsFormatted), unoHorAlignArgs, 1);
388 lcl_registerToolItem(rWindow, rWindow.m_pLeftpara,
".uno:HorizontalAlignment", std::string(unoHorAlignArgsFormatted));
389 snprintf(unoHorAlignArgsFormatted,
sizeof(unoHorAlignArgsFormatted), unoHorAlignArgs, 2);
390 lcl_registerToolItem(rWindow, rWindow.m_pCenterpara,
".uno:HorizontalAlignment", std::string(unoHorAlignArgsFormatted));
391 snprintf(unoHorAlignArgsFormatted,
sizeof(unoHorAlignArgsFormatted), unoHorAlignArgs, 3);
** CID 1398369: Null pointer dereferences (FORWARD_NULL)
/sw/source/core/draw/dcontact.cxx: 589 in
SwFlyDrawContact::SwClientNotify(const SwModify &, const SfxHint &)()
*** CID 1398369: Null pointer dereferences (FORWARD_NULL)
/sw/source/core/draw/dcontact.cxx: 589 in
SwFlyDrawContact::SwClientNotify(const SwModify &, const SfxHint &)()
583 SwContact::SwClientNotify(rMod, rHint);
584 if(auto pGetZOrdnerHint = dynamic_cast(&rHint))
585 {
586 // #i11176#
587 // This also needs to work when no layout exists. Thus, for
588 // FlyFrames an alternative method is used now in that case.
>>> CID 1398369: Null pointer dereferences (FORWARD_NULL)
>>> Assigning: "pFormat" = "dynamic_cast (rMod)".
589 auto pFormat(dynamic_cast(&rMod));
590 if(pFormat->Which() == RES_FLYFRMFMT &&
!pFormat->getIDocumentLayoutAccess().GetCurrentViewShell())
591 pGetZOrdnerHint->m_rnZOrder = GetMaster()->GetOrdNum();
592 }
593 }
594
To view the defects in Coverity Scan visit,
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB72ibeUH-2F-2F1Lhi9AZq3dRu-2F4-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpy8KKgQJetE0bvSegy2wEPKZOpuitNhTzMIun-2BLWgzpRkQ2zgqBpc2AvpeJSTeh-2Fjl-2FYy9avV7ZbFQ1kQllmVEAIO0RmdIfhEB6PVvF1gJQMN3VAWF92mpCIav5grL-2BoaG4g0hOUk1kWuhZFHxMEikAU-2BBx1E-2FOboBHL4lGe2rzyY-3D
To manage Coverity Scan email notifications for
"libreoffice@lists.freedesktop.org", click
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRbVDbis712qZDP-2FA8y06Nq4k1FZJSDV-2FTHi5VQof9xGafB4oBwGYxuHHknceo2QLpCrZ44Ciy7AqBR2QyX6OCB5N5X-2B1MAElavPQhH6nLwozJzqOkt2k8uOkYf2ZoppNa9QVe0
Re: Bug TDF#99097 - Call for reflection
Hi Pierre, On Friday, 2016-12-30 06:24:27 -0500, Pierre Lepage wrote: > StarBasic encodes "N" and "NN" as formats different > from those of LO, but similar to VBA, ie "N" for minutes without 0 in prefix > and "NN" for minutes With 0 in prefix. Where does it do that? Could you provide a code pointer please? > The first solution appears as a crutch. Coding for an exception will not > resolve the source of confusion. Nevertheless, if this solution were to be > implemented, the algorithm would have to distinguish between two situations > of the codes: a) the codes are embedded in a time format string only in > which case the interpretation of the N and NN codes would be in conformity > To VBA, that is to say that N would code for minutes without 0 in prefix and > NN would code for minutes with 0 in prefix; B) otherwise the codes would be > interpreted as they are now, ie NN would code for the abbreviation of the > name of the day and N would be ignored. I'd refrain from such diversion in the number formatter code.. > The second solution appears more robust. The confusion would be definitively > eliminated. It remains that the historical reason behind the choice of the > letters NN and NNN rather than exclusively DDD and to codify an > abbreviated and long day format is unknown to me. It is therefore possible > that old files based on the current interpretation of the NN, NNN and > codes will require corrections to rely solely on the DDD and codes. Which also is not easily possible, because documents may use format codes relying on the behavior, even worse use such format codes in Calc's TEXT() spreadsheet function as argument. > I included a Calc file summarizing the format codes for dates and time. The > first tab is the current situation. The second tab is for the situation once > the second solution is implemented. > > So, before going any further, I need to know the desired orientation for > LibreOffice. I'd change the StarBasic code to pass on modified format codes, H for N and HH for NN. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: kit/Kit.cpp
kit/Kit.cpp |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 4641c922eac1c5f5d2ed2adefd8119011e7fdab5
Author: Henry Castro
Date: Fri Jan 6 15:49:33 2017 -0400
kit: use a second stage init after fork call
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 62a183a..bfe75de 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -95,6 +95,7 @@ using namespace LOOLProtocol;
// We only host a single document in our lifetime.
class Document;
static std::shared_ptr document;
+static LokHookFunction2* pInit = nullptr;
namespace
{
@@ -1594,7 +1595,7 @@ void lokit_main(const std::string& childRoot,
auto kit = UnitKit::get().lok_init(instdir, userdir);
if (!kit)
{
-kit = lok_init_2(instdir, userdir);
+kit = (pInit ? pInit(instdir, userdir) : lok_init_2(instdir,
userdir));
}
loKit = std::make_shared(kit);
@@ -1792,6 +1793,12 @@ bool globalPreinit(const std::string &loTemplate)
return false;
}
+pInit = reinterpret_cast(dlsym(handle,
"libreofficekit_hook_2"));
+if (!pInit)
+{
+LOG_FTL("No libreofficekit_hook_2 symbol in " << loadedLibrary << ": "
<< dlerror());
+}
+
LOG_TRC("lok_preinit(" << loTemplate << "/program\", \"file:///user\")");
if (preInit((loTemplate + "/program").c_str(), "file:///user") != 0)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/source
sc/source/filter/xml/xmlcelli.cxx | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
New commits:
commit cb7ab49dde0ae21c472300f126cce4555a3e0ae5
Author: Eike Rathke
Date: Fri Jan 6 18:28:42 2017 +0100
recognize the broken "Err:xxx" written by 5.2 and earlier, tdf#105024
related
... and handle same as "#ERRxxx!" if present.
Change-Id: I1ebb31d628b080c52b450a8fe624c20e9e1188b7
(cherry picked from commit 75d963bc7bb87429f304d29138c27178880c039a)
Reviewed-on: https://gerrit.libreoffice.org/32793
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index 3b38ac4..8fd7eda 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1357,11 +1357,22 @@ void ScXMLTableRowCellContext::PutFormulaCell( const
ScAddress& rCellPos )
}
else
{
-OUString aFormulaNmsp = maFormula->second;
-if( eGrammar != formula::FormulaGrammar::GRAM_EXTERNAL )
-aFormulaNmsp.clear();
-pCode->AssignXMLString( aText, aFormulaNmsp );
-rDoc.getDoc().IncXMLImportedFormulaCount( aText.getLength() );
+// 5.2 and earlier wrote broken "Err:xxx" as formula to designate
+// an error formula cell.
+if (aText.startsWithIgnoreAsciiCase("Err:") && aText.getLength()
<= 9 &&
+((nError =
+ GetScImport().GetFormulaErrorConstant( "#ERR" +
aText.copy(4) + "!")) != FormulaError::NONE))
+{
+pCode->SetCodeError(nError);
+}
+else
+{
+OUString aFormulaNmsp = maFormula->second;
+if( eGrammar != formula::FormulaGrammar::GRAM_EXTERNAL )
+aFormulaNmsp.clear();
+pCode->AssignXMLString( aText, aFormulaNmsp );
+rDoc.getDoc().IncXMLImportedFormulaCount( aText.getLength() );
+}
}
ScFormulaCell* pNewCell = new ScFormulaCell(pDoc, rCellPos, pCode,
eGrammar, MM_NONE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Problems with Compiling
Hi Moritz, On Wednesday, 2017-01-04 12:30:51 +, Moritz Staudinger wrote: > I was able to clone the Project and the online version of it, but when i run > the make check command on github.com/Libreoffice/core , the sfx2_complex Unit > Test fail. Can I fix this easily? You didn't say what fails nor what platform you're on.. As a side note, github might work and usually is in sync, but I'd recommend to pull from git://anongit.freedesktop.org/libreoffice/core or git://gerrit.libreoffice.org/core instead. > Furthermore I would like to set the Menu to another language, is there a way > to do this? I tried > > ./autogen.sh --without-help --with-lang=ALL , but when I start Office it is > still English. The default UI language is selected according to your system settings, or if for that no match is found then a fallback to English. Maybe you need to explicitly select an UI language under Tools->Options->LanguageSettings Second, --with-lang=ALL can be quite some overhead to build for all languages. Recommendable is a selective list, e.g. if you want a German UI then --with-lang=de which still builds an en-US UI as well. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: kit/Kit.cpp
kit/Kit.cpp |2 -- 1 file changed, 2 deletions(-) New commits: commit 22b80e285baea2d9a801cfe808d2a95550bf5e22 Author: Henry Castro Date: Fri Jan 6 15:35:57 2017 -0400 kit: remove unused typedef function pointer diff --git a/kit/Kit.cpp b/kit/Kit.cpp index 2b6eac1..62a183a 100644 --- a/kit/Kit.cpp +++ b/kit/Kit.cpp @@ -68,8 +68,6 @@ #define LIB_SOFFICEAPP "lib" "sofficeapp" ".so" #define LIB_MERGED "lib" "mergedlo" ".so" -typedef int (LokHookPreInit) (const char *install_path, const char *user_profile_path); - using Poco::Exception; using Poco::File; using Poco::JSON::Array; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 4 commits - download.lst external/curl external/expat ucb/source
download.lst|8
external/curl/ExternalPackage_curl.mk |2
external/curl/ExternalProject_curl.mk |2
external/curl/UnpackedTarball_curl.mk |3
external/curl/curl-7.26.0_win-proxy.patch | 43 -
external/curl/curl-freebsd.patch.1 | 32 -
external/curl/curl-msvc-schannel.patch.1|4
external/curl/curl-msvc.patch.1 | 12
external/expat/CVE-2015-1283-refix.patch.1 | 37 -
external/expat/CVE-2016-0718-v2-2-1.patch.1 | 755
external/expat/UnpackedTarball_expat.mk |2
ucb/source/ucp/ftp/ftploaderthread.cxx |2
12 files changed, 42 insertions(+), 860 deletions(-)
New commits:
commit 31b3cf5726d2d7fbaa5e08e7281c6123b6b54742
Author: Michael Stahl
Date: Wed Nov 2 11:48:21 2016 +0100
curl: upgrade to version 7.51.0
- fixes about a dozen CVEs
- tweak curl-7.26.0_win-proxy.patch:
there is a "checksrc" thing now in curl that fails the build with:
warning: use of strtok is banned (BANNEDFUNC)
so use strtok_s instead (which is MSVC's name for standard strtok_r)
- use Makefile.vc12 instead of Makefile.vc10
- remove strequal.obj from Makefile.vc12, it does not actually exist
Change-Id: Ie2da64980d88c72b0c902376ffc01abf97a7bc91
Reviewed-on: https://gerrit.libreoffice.org/30484
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/download.lst b/download.lst
index 0da981a..2a4c12c 100755
--- a/download.lst
+++ b/download.lst
@@ -21,8 +21,8 @@ export COLLADA2GLTF_TARBALL :=
4b87018f7fff1d054939d19920b751a0-collada2gltf-mas
export CPPUNIT_MD5SUM := d1c6bdd5a76c66d2c38331e2d287bc01
export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz
export CT2N_TARBALL :=
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_MD5SUM := 03940d7d4fcea1521fbbf07c1cf16f5e
-export CURL_TARBALL := curl-7.50.0.tar.gz
+export CURL_MD5SUM := 490e19a8ccd1f4a244b50338a0eb9456
+export CURL_TARBALL := curl-7.51.0.tar.gz
export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78
export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2
diff --git a/external/curl/ExternalProject_curl.mk
b/external/curl/ExternalProject_curl.mk
index d91b61c..b2fc60d 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -79,7 +79,7 @@ else ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
- MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc10 \
+ MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc12 \
cfg=$(if
$(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll) \
EXCFLAGS="/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE
/DUSE_WINDOWS_SSPI /D_USING_V110_SDK71_ $(SOLARINC)" $(if $(filter
X86_64,$(CPUNAME)),MACHINE=X64) \
,lib)
diff --git a/external/curl/UnpackedTarball_curl.mk
b/external/curl/UnpackedTarball_curl.mk
index fc9d3d2..63055a2 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -14,7 +14,7 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl))
$(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1))
$(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
- lib/Makefile.vc10 \
+ lib/Makefile.vc12 \
))
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
diff --git a/external/curl/curl-7.26.0_win-proxy.patch
b/external/curl/curl-7.26.0_win-proxy.patch
index 4c5327f..580479a 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
@@ -1,5 +1,5 @@
curl-7.26.0/lib/Makefile.vc10
-+++ misc/build/curl-7.26.0/lib/Makefile.vc10
+--- curl-7.26.0/lib/Makefile.vc12
misc/build/curl-7.26.0/lib/Makefile.vc12
@@ -118,7 +118,7 @@
WINSSLLIBS = crypt32.lib
ZLIBLIBSDLL = zdll.lib
@@ -13,7 +13,7 @@
+++ misc/build/curl-7.26.0/lib/url.c
@@ -78,6 +78,10 @@
bool curl_win32_idn_to_ascii(const char *in, char **out);
- #endif /* USE_LIBIDN */
+ #endif /* USE_LIBIDN2 */
+#ifdef WIN32
+#include
@@ -52,7 +52,7 @@
#ifndef CURL_DISABLE_HTTP
/* If proxy was not specified, we check for default proxy environment
-@@ -4613,7 +4633,63 @@
+@@ -4613,7 +4633,64 @@
* For compatibility, the all-uppercase versions of these variables are
* checked if the lowercase versions don't exist.
*/
@@ -83,9 +83,10 @@
+ if(!check_noproxy(conn->host.name, no_proxy)) {
+/* Look for the http proxy setting */
+char* tok;
++char *saveptr;
+
+if(NULL != ieProxy) {
-+ tok = strtok(ieProxy, ";");
++ tok = strtok_s(ieProxy, ";", &saveptr);
+ if(strchr(tok, '=') == NULL) {
+proxy = strdup(ieProxy);
+ }
@@ -95,7 +96,7 @@
+/* We found HTTP proxy va
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - 2 commits - formula/source sc/source
formula/source/core/api/FormulaCompiler.cxx |5 +++--
sc/source/core/data/formulacell.cxx |4
sc/source/filter/xml/xmlcelli.cxx | 23 +--
sc/source/filter/xml/xmlimprt.cxx |6 +++---
sc/source/filter/xml/xmlimprt.hxx |2 +-
5 files changed, 28 insertions(+), 12 deletions(-)
New commits:
commit 4164596f43132e7769057170a228d74118ee63c6
Author: Eike Rathke
Date: Fri Jan 6 17:46:02 2017 +0100
read single error constant formula as such, tdf#105024 related
... without creating a token so when writing again no leading '=' is
prepended,
with which we can enable 5.2 to read such thing correctly, and when
re-reading
in 5.3 it also doesn't lead to a "real" formula.
Change-Id: I26fbd20536436b49b781e2bbb5bba1dc6bafbb37
(cherry picked from commit 4fcbe16959c839bfacf745cfa554b234e639f794)
Reviewed-on: https://gerrit.libreoffice.org/32792
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index a3f14b4..bf6fc4e 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1282,6 +1282,10 @@ void ScFormulaCell::CompileXML(
sc::CompileFormulaContext& rCxt, ScProgress& rPr
return ;
}
+// Error constant formula cell stays as is.
+if (!pCode->GetLen() && pCode->GetCodeError() != FormulaError::NONE)
+return;
+
// Compilation changes RPN count, remove and reinsert to FormulaTree if it
// was in to update its count.
bool bWasInFormulaTree = pDocument->IsInFormulaTree( this);
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index ddd8543..3b38ac4 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1348,12 +1348,22 @@ void ScXMLTableRowCellContext::PutFormulaCell( const
ScAddress& rCellPos )
// temporary formula string as string tokens
ScTokenArray *pCode = new ScTokenArray();
-OUString aFormulaNmsp = maFormula->second;
-if( eGrammar != formula::FormulaGrammar::GRAM_EXTERNAL )
-aFormulaNmsp.clear();
-pCode->AssignXMLString( aText, aFormulaNmsp );
+// Check the special case of a single error constant without leading
+// '=' and create an error formula cell without tokens.
+FormulaError nError = GetScImport().GetFormulaErrorConstant(aText);
+if (nError != FormulaError::NONE)
+{
+pCode->SetCodeError(nError);
+}
+else
+{
+OUString aFormulaNmsp = maFormula->second;
+if( eGrammar != formula::FormulaGrammar::GRAM_EXTERNAL )
+aFormulaNmsp.clear();
+pCode->AssignXMLString( aText, aFormulaNmsp );
+rDoc.getDoc().IncXMLImportedFormulaCount( aText.getLength() );
+}
-rDoc.getDoc().IncXMLImportedFormulaCount( aText.getLength() );
ScFormulaCell* pNewCell = new ScFormulaCell(pDoc, rCellPos, pCode,
eGrammar, MM_NONE);
SetFormulaCell(pNewCell);
rDoc.setFormulaCell(rCellPos, pNewCell);
@@ -1466,7 +1476,8 @@ bool ScXMLTableRowCellContext::IsPossibleErrorString()
const
return false;
else if(mbNewValueType && mbErrorValue)
return true;
-return mbPossibleErrorCell || ( mbCheckWithCompilerForError &&
GetScImport().IsFormulaErrorConstant(*maStringValue) );
+return mbPossibleErrorCell || (mbCheckWithCompilerForError &&
+GetScImport().GetFormulaErrorConstant(*maStringValue) !=
FormulaError::NONE);
}
void ScXMLTableRowCellContext::EndElement()
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index d74f871..f1a818689 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -3407,12 +3407,12 @@ void ScXMLImport::ExtractFormulaNamespaceGrammar(
reGrammar = eDefaultGrammar;
}
-bool ScXMLImport::IsFormulaErrorConstant( const OUString& rStr ) const
+FormulaError ScXMLImport::GetFormulaErrorConstant( const OUString& rStr ) const
{
if (!mpComp)
-return false;
+return FormulaError::NONE;
-return mpComp->GetErrorConstant(rStr) > FormulaError::NONE;
+return mpComp->GetErrorConstant(rStr);
}
ScEditEngineDefaulter* ScXMLImport::GetEditEngine()
diff --git a/sc/source/filter/xml/xmlimprt.hxx
b/sc/source/filter/xml/xmlimprt.hxx
index 317fad7..28f9ae9 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -1223,7 +1223,7 @@ public:
const OUString& rAttrValue,
bool bRestrictToExternalNmsp = false ) const;
-bool IsFormulaErrorConstant( const OUString& rStr ) const;
+FormulaError GetFormulaErrorConstant( const OUString& rStr ) const;
ScEditEngineDefaulter* GetEditEngine();
const ScXMLEditAttributeMap& GetEditAttributeMap() const;
com
[Libreoffice-commits] core.git: filter/source sd/qa
filter/source/msfilter/svdfppt.cxx | 21 +
sd/qa/unit/data/ppt/tdf105150.ppt |binary
sd/qa/unit/import-tests.cxx| 14 ++
3 files changed, 35 insertions(+)
New commits:
commit b9648deb1d99cde1c085767433242d6e1b834e2d
Author: Miklos Vajna
Date: Fri Jan 6 17:44:11 2017 +0100
Related: tdf#105150 PPT import: handle mso_fillBackground fill type of
shapes
Equivalent OOXML markup is . For now only handle the
case when the slide doesn't have an explicit background, and assume that
in that case we can default to white solid fill.
This partially restores the code removed in
6137b5f72f5ec491ea6bd6631a65484fa24d2973 (coverity#735432 Logically dead
code, 2014-03-25), so that ProcessData::aBackgroundColoredObjects is
actually read.
Change-Id: I9e7a9a41965db50638e9d9d1b2361af9fd7a98ca
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index b5e8a53..2fab16a 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2898,6 +2898,27 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet,
const PptSlidePersistEntry*
break;
}
+// Handle shapes where the fill matches the background
+// fill (mso_fillBackground).
+if (rSlidePersist.ePageKind == PPT_SLIDEPAGE)
+{
+if
(!aProcessData.aBackgroundColoredObjects.empty())
+{
+if (!rSlidePersist.pBObj)
+{
+for (auto pObject :
aProcessData.aBackgroundColoredObjects)
+{
+// The shape wants a background, but
the slide doesn't have
+// one: default to white.
+SfxItemSet
aNewSet(*pObject->GetMergedItemSet().GetPool());
+
aNewSet.Put(XFillStyleItem(css::drawing::FillStyle_SOLID));
+aNewSet.Put(XFillColorItem(OUString(),
Color(COL_WHITE)));
+pObject->SetMergedItemSet(aNewSet);
+}
+}
+}
+}
+
if ( rSlidePersist.pBObj )
{
// #i99386# transfer the attributes from the
temporary BackgroundObject
diff --git a/sd/qa/unit/data/ppt/tdf105150.ppt
b/sd/qa/unit/data/ppt/tdf105150.ppt
new file mode 100644
index 000..c832371
Binary files /dev/null and b/sd/qa/unit/data/ppt/tdf105150.ppt differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index eb56ffb..dd5f2e0 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -135,6 +135,7 @@ public:
void testTdf103477();
void testTdf104445();
void testTdf105150();
+void testTdf105150PPT();
CPPUNIT_TEST_SUITE(SdImportTest);
@@ -194,6 +195,7 @@ public:
CPPUNIT_TEST(testTdf103477);
CPPUNIT_TEST(testTdf104445);
CPPUNIT_TEST(testTdf105150);
+CPPUNIT_TEST(testTdf105150PPT);
CPPUNIT_TEST_SUITE_END();
};
@@ -1655,6 +1657,18 @@ void SdImportTest::testTdf105150()
xDocShRef->DoClose();
}
+void SdImportTest::testTdf105150PPT()
+{
+sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/ppt/tdf105150.ppt"), PPT);
+const SdrPage* pPage = GetPage(1, xDocShRef);
+const SdrObject* pObj = pPage->GetObj(1);
+// This was drawing::FillStyle_NONE, the shape's mso_fillBackground was
+// ignored when the slide didn't have an explicit background fill.
+auto& rFillStyleItem = dynamic_cast(pObj->GetMergedItem(XATTR_FILLSTYLE));
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, rFillStyleItem.GetValue());
+xDocShRef->DoClose();
+}
+
void SdImportTest::testTdf104445()
{
// Extra bullets were added to the first shape
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/source
sc/source/core/data/formulacell.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 74c3abeb970015f72a081cbfea59007fd0cbb011
Author: Eike Rathke
Date: Fri Jan 6 16:55:32 2017 +0100
out of bounds string access
Change-Id: Iecbe24f90cefe34a447cd52a44967a4b09b4394b
(cherry picked from commit 00f17500520bcb2634146496adc8de9f4d28eea5)
Reviewed-on: https://gerrit.libreoffice.org/32787
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 465f0b8..a3f14b4 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1355,7 +1355,7 @@ void ScFormulaCell::CompileXML(
sc::CompileFormulaContext& rCxt, ScProgress& rPr
{
if ( !pCode->GetLen() )
{
-if ( aFormula[0] == '=' )
+if ( !aFormula.isEmpty() && aFormula[0] == '=' )
pCode->AddBad( aFormula.copy( 1 ) );
else
pCode->AddBad( aFormula );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - formula/source sc/source
formula/source/core/api/FormulaCompiler.cxx |5 ++--
sc/source/core/data/formulacell.cxx |4 +++
sc/source/filter/xml/xmlcelli.cxx | 34 +++-
sc/source/filter/xml/xmlimprt.cxx |6 ++--
sc/source/filter/xml/xmlimprt.hxx |2 -
5 files changed, 39 insertions(+), 12 deletions(-)
New commits:
commit 75d963bc7bb87429f304d29138c27178880c039a
Author: Eike Rathke
Date: Fri Jan 6 18:28:42 2017 +0100
recognize the broken "Err:xxx" written by 5.2 and earlier, tdf#105024
related
... and handle same as "#ERRxxx!" if present.
Change-Id: I1ebb31d628b080c52b450a8fe624c20e9e1188b7
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index 3b38ac4..8fd7eda 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1357,11 +1357,22 @@ void ScXMLTableRowCellContext::PutFormulaCell( const
ScAddress& rCellPos )
}
else
{
-OUString aFormulaNmsp = maFormula->second;
-if( eGrammar != formula::FormulaGrammar::GRAM_EXTERNAL )
-aFormulaNmsp.clear();
-pCode->AssignXMLString( aText, aFormulaNmsp );
-rDoc.getDoc().IncXMLImportedFormulaCount( aText.getLength() );
+// 5.2 and earlier wrote broken "Err:xxx" as formula to designate
+// an error formula cell.
+if (aText.startsWithIgnoreAsciiCase("Err:") && aText.getLength()
<= 9 &&
+((nError =
+ GetScImport().GetFormulaErrorConstant( "#ERR" +
aText.copy(4) + "!")) != FormulaError::NONE))
+{
+pCode->SetCodeError(nError);
+}
+else
+{
+OUString aFormulaNmsp = maFormula->second;
+if( eGrammar != formula::FormulaGrammar::GRAM_EXTERNAL )
+aFormulaNmsp.clear();
+pCode->AssignXMLString( aText, aFormulaNmsp );
+rDoc.getDoc().IncXMLImportedFormulaCount( aText.getLength() );
+}
}
ScFormulaCell* pNewCell = new ScFormulaCell(pDoc, rCellPos, pCode,
eGrammar, MM_NONE);
commit 4fcbe16959c839bfacf745cfa554b234e639f794
Author: Eike Rathke
Date: Fri Jan 6 17:46:02 2017 +0100
read single error constant formula as such, tdf#105024 related
... without creating a token so when writing again no leading '=' is
prepended,
with which we can enable 5.2 to read such thing correctly, and when
re-reading
in 5.3 it also doesn't lead to a "real" formula.
Change-Id: I26fbd20536436b49b781e2bbb5bba1dc6bafbb37
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 9398159..9ad3731 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1282,6 +1282,10 @@ void ScFormulaCell::CompileXML(
sc::CompileFormulaContext& rCxt, ScProgress& rPr
return ;
}
+// Error constant formula cell stays as is.
+if (!pCode->GetLen() && pCode->GetCodeError() != FormulaError::NONE)
+return;
+
// Compilation changes RPN count, remove and reinsert to FormulaTree if it
// was in to update its count.
bool bWasInFormulaTree = pDocument->IsInFormulaTree( this);
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index ddd8543..3b38ac4 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1348,12 +1348,22 @@ void ScXMLTableRowCellContext::PutFormulaCell( const
ScAddress& rCellPos )
// temporary formula string as string tokens
ScTokenArray *pCode = new ScTokenArray();
-OUString aFormulaNmsp = maFormula->second;
-if( eGrammar != formula::FormulaGrammar::GRAM_EXTERNAL )
-aFormulaNmsp.clear();
-pCode->AssignXMLString( aText, aFormulaNmsp );
+// Check the special case of a single error constant without leading
+// '=' and create an error formula cell without tokens.
+FormulaError nError = GetScImport().GetFormulaErrorConstant(aText);
+if (nError != FormulaError::NONE)
+{
+pCode->SetCodeError(nError);
+}
+else
+{
+OUString aFormulaNmsp = maFormula->second;
+if( eGrammar != formula::FormulaGrammar::GRAM_EXTERNAL )
+aFormulaNmsp.clear();
+pCode->AssignXMLString( aText, aFormulaNmsp );
+rDoc.getDoc().IncXMLImportedFormulaCount( aText.getLength() );
+}
-rDoc.getDoc().IncXMLImportedFormulaCount( aText.getLength() );
ScFormulaCell* pNewCell = new ScFormulaCell(pDoc, rCellPos, pCode,
eGrammar, MM_NONE);
SetFormulaCell(pNewCell);
rDoc.setFormulaCell(rCellPos, pNewCell);
@@ -1466,7 +1476,8 @@ bool ScXMLTableRowCellContext::IsPossibleErrorString()
const
return false;
else if(mbNewV
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/window2.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit d788d37a16d382d7ff32a19e8d65e5c605ac55dd Author: Michael Meeks Date: Fri Jan 6 15:23:30 2017 + tdf#105151 - be more conservative about EndTracking / Tracking calls. We really shouldn't be emitting these into widgets after they are disposed - it serves only to confuse things. Restore behaviour to how it was before the VclPtr change for this. Change-Id: Ife666929f8aac0e4431a5e43970769692c11888c Reviewed-on: https://gerrit.libreoffice.org/32785 Tested-by: Jenkins Reviewed-by: Michael Meeks diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index b6f4ea4..1c8be91 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -365,7 +365,11 @@ void Window::EndTracking( TrackingEventFlags nFlags ) mpWindowImpl->mpFrameData->mnMouseCode, mpWindowImpl->mpFrameData->mnMouseCode ); TrackingEvent aTEvt( aMEvt, nFlags | TrackingEventFlags::End ); -Tracking( aTEvt ); +// CompatTracking effectively +if (!mpWindowImpl || mpWindowImpl->mbInDispose) +return Window::Tracking( aTEvt ); +else +return Tracking( aTEvt ); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang helpcompiler/source vcl/source
compilerplugins/clang/charrightshift.cxx | 57 +++
helpcompiler/source/HelpLinker.cxx |2 -
vcl/source/fontsubset/cff.cxx|2 -
3 files changed, 59 insertions(+), 2 deletions(-)
New commits:
commit a7d554f3b24d582919656233476c89a6d74cb207
Author: Stephan Bergmann
Date: Fri Jan 6 18:15:24 2017 +0100
New loplugin:charrightshift
Change-Id: Ib645fb11004bc0fe05c9c416ae72b0ae56c23a15
diff --git a/compilerplugins/clang/charrightshift.cxx
b/compilerplugins/clang/charrightshift.cxx
new file mode 100644
index 000..c1bf951
--- /dev/null
+++ b/compilerplugins/clang/charrightshift.cxx
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "check.hxx"
+#include "plugin.hxx"
+
+namespace {
+
+class CharRightShift:
+public RecursiveASTVisitor, public loplugin::Plugin
+{
+public:
+explicit CharRightShift(InstantiationData const & data): Plugin(data) {}
+
+void run() override
+{ TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+
+bool VisitBinShr(BinaryOperator const * expr) {
+if (ignoreLocation(expr)) {
+return true;
+}
+auto t = expr->getLHS()->IgnoreParenImpCasts()->getType();
+if (!loplugin::TypeCheck(t).Char()) {
+return true;
+}
+if (!expr->getRHS()->getType()->isBuiltinType()) {
+//TODO: in which case the expression should be an
+// CXXOperatorCallExpr instead of a BinaryOperator? but at least
+// recent Clang trunk reports
+//
+// '(' >> orExpression
+//
+// (connectivity/source/commontools/RowFunctionParser.cxx, the RHS
+// being of type boost::spirit::rule) here
+return true;
+}
+report(
+DiagnosticsEngine::Warning,
+("right shift of %0 is implementation-defined when 'char' is
signed"
+ " and value is negative"),
+expr->getLHS()->getExprLoc())
+<< t << expr->getSourceRange();
+return true;
+}
+};
+
+loplugin::Plugin::Registration X("charrightshift");
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/helpcompiler/source/HelpLinker.cxx
b/helpcompiler/source/HelpLinker.cxx
index 66ad44b..cfff46a 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -216,7 +216,7 @@ namespace URLEncoder
result += c;
else {
result += '%';
-result += hex[c >> 4];
+result += hex[static_cast(c) >> 4];
result += hex[c & 0xf];
}
}
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index cca14ed..a50801f 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -1777,7 +1777,7 @@ inline void Type1Emitter::emitAllHex()
char* pOut = aHexBuf;
while( (p < mpPtr) && (pOut < aHexBuf+sizeof(aHexBuf)-4)) {
// convert each byte to hex
-char cNibble = (*p >> 4) & 0x0F;
+char cNibble = (static_cast(*p) >> 4) & 0x0F;
cNibble += (cNibble < 10) ? '0' : 'A'-10;
*(pOut++) = cNibble;
cNibble = *(p++) & 0x0F;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sd/qa
oox/source/ppt/pptshapegroupcontext.cxx | 10 +-
sd/qa/unit/data/pptx/tdf105150.pptx |binary
sd/qa/unit/import-tests.cxx | 14 ++
3 files changed, 23 insertions(+), 1 deletion(-)
New commits:
commit 59339dec1ce56213dc74a06af2f0d35ac1c534d7
Author: Miklos Vajna
Date: Fri Jan 6 16:55:22 2017 +0100
tdf#105150 PPTX import: try harder to handle
The bugdoc has two shapes. The red rectangle is supposed to be covered
by the other shape, but it wasn't as the fill style was set to none. The
reason for that was we ignored useBgFill, unless the slide had an
explicit fill style. Assume that in that case a white solid fill is the
default.
Change-Id: Iea20e216e44e13db68887f285c10bc1a8feacf0a
Reviewed-on: https://gerrit.libreoffice.org/32786
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx
b/oox/source/ppt/pptshapegroupcontext.cxx
index 57f0f912..5208bd4 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -101,7 +101,15 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext(
sal_Int32 aElementToken
std::shared_ptr pShape( new PPTShape( meShapeLocation,
"com.sun.star.drawing.CustomShape" ) );
if( rAttribs.getBool( XML_useBgFill, false ) )
{
-const oox::drawingml::FillPropertiesPtr
pBackgroundPropertiesPtr = mpSlidePersistPtr->getBackgroundProperties();
+oox::drawingml::FillPropertiesPtr pBackgroundPropertiesPtr =
mpSlidePersistPtr->getBackgroundProperties();
+if (!pBackgroundPropertiesPtr)
+{
+// The shape wants a background, but the slide doesn't have
+// one: default to white.
+pBackgroundPropertiesPtr.reset(new
oox::drawingml::FillProperties());
+pBackgroundPropertiesPtr->moFillType = XML_solidFill;
+pBackgroundPropertiesPtr->maFillColor.setSrgbClr(0xFF);
+}
if ( pBackgroundPropertiesPtr ) {
pShape->getFillProperties().assignUsed(
*pBackgroundPropertiesPtr );
}
diff --git a/sd/qa/unit/data/pptx/tdf105150.pptx
b/sd/qa/unit/data/pptx/tdf105150.pptx
new file mode 100644
index 000..48a2e01
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf105150.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index f4faf00..eb56ffb 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -134,6 +134,7 @@ public:
void testTdf104201();
void testTdf103477();
void testTdf104445();
+void testTdf105150();
CPPUNIT_TEST_SUITE(SdImportTest);
@@ -192,6 +193,7 @@ public:
CPPUNIT_TEST(testTdf104201);
CPPUNIT_TEST(testTdf103477);
CPPUNIT_TEST(testTdf104445);
+CPPUNIT_TEST(testTdf105150);
CPPUNIT_TEST_SUITE_END();
};
@@ -1641,6 +1643,18 @@ void SdImportTest::testTdf103477()
xDocShRef->DoClose();
}
+void SdImportTest::testTdf105150()
+{
+sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf105150.pptx"),
PPTX);
+const SdrPage* pPage = GetPage(1, xDocShRef);
+const SdrObject* pObj = pPage->GetObj(1);
+auto& rFillStyleItem = dynamic_cast(pObj->GetMergedItem(XATTR_FILLSTYLE));
+// This was drawing::FillStyle_NONE, was ignored when
+// the slide didn't have an explicit background fill.
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, rFillStyleItem.GetValue());
+xDocShRef->DoClose();
+}
+
void SdImportTest::testTdf104445()
{
// Extra bullets were added to the first shape
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/source
sc/source/ui/condformat/condformatdlg.cxx |8
sc/source/ui/inc/condformatdlg.hxx|1 +
2 files changed, 9 insertions(+)
New commits:
commit 9341c166d6b2971e637ba9d17f7be68f5bb852f3
Author: Caolán McNamara
Date: Fri Jan 6 16:18:37 2017 +
Resolves: tdf#105061 Only one text box shown in case of 'between'
non-layout ScCondFormatList widget not responding to layout child change
Change-Id: I7edd4fc54de9e71fb86b47a9b182bfc22fa4af25
(cherry picked from commit ac561ab34ea9d26243fe3791f624c440dcf7ae6d)
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index 22bd55a..b6e2191 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -157,6 +157,14 @@ void ScCondFormatList::Resize()
RecalcAll();
}
+void ScCondFormatList::queue_resize(StateChangedType eReason)
+{
+Control::queue_resize(eReason);
+if (!mpDialogParent) //detects that this is during dispose
+return;
+RecalcAll();
+}
+
ScConditionalFormat* ScCondFormatList::GetConditionalFormat() const
{
if(maEntries.empty())
diff --git a/sc/source/ui/inc/condformatdlg.hxx
b/sc/source/ui/inc/condformatdlg.hxx
index 62f3758..a79ae0d 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -66,6 +66,7 @@ public:
condformat::dialog::ScCondFormatDialogType eType);
virtual Size GetOptimalSize() const override;
+virtual void queue_resize(StateChangedType eReason =
StateChangedType::Layout) override;
virtual void Resize() override;
ScConditionalFormat* GetConditionalFormat() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - external/breakpad sc/source
external/breakpad/README | 22 +-
sc/source/ui/condformat/condformatdlg.cxx |8
sc/source/ui/inc/condformatdlg.hxx|1 +
3 files changed, 30 insertions(+), 1 deletion(-)
New commits:
commit ac561ab34ea9d26243fe3791f624c440dcf7ae6d
Author: Caolán McNamara
Date: Fri Jan 6 16:18:37 2017 +
Resolves: tdf#105061 Only one text box shown in case of 'between'
non-layout ScCondFormatList widget not responding to layout child change
Change-Id: I7edd4fc54de9e71fb86b47a9b182bfc22fa4af25
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index 22bd55a..b6e2191 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -157,6 +157,14 @@ void ScCondFormatList::Resize()
RecalcAll();
}
+void ScCondFormatList::queue_resize(StateChangedType eReason)
+{
+Control::queue_resize(eReason);
+if (!mpDialogParent) //detects that this is during dispose
+return;
+RecalcAll();
+}
+
ScConditionalFormat* ScCondFormatList::GetConditionalFormat() const
{
if(maEntries.empty())
diff --git a/sc/source/ui/inc/condformatdlg.hxx
b/sc/source/ui/inc/condformatdlg.hxx
index 62f3758..a79ae0d 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -66,6 +66,7 @@ public:
condformat::dialog::ScCondFormatDialogType eType);
virtual Size GetOptimalSize() const override;
+virtual void queue_resize(StateChangedType eReason =
StateChangedType::Layout) override;
virtual void Resize() override;
ScConditionalFormat* GetConditionalFormat() const;
commit abf38a157eabe867fb23a85901e149a50e6782cd
Author: Michael Stahl
Date: Fri Jan 6 17:15:17 2017 +0100
breakpad: document how to read mini-dumps locally
Change-Id: I888930079fc93c609769ac31a025c410b9adad96
diff --git a/external/breakpad/README b/external/breakpad/README
index 41fbde6..dfd2bf9 100644
--- a/external/breakpad/README
+++ b/external/breakpad/README
@@ -1 +1,21 @@
-Render glTF 3D models.
+Google breakpad crash-reporting library
+
+https://chromium.googlesource.com/breakpad/breakpad
+
+When this is enabled and soffice.bin crashes, a "mini-dump" file is written
+as "instdir/crash/*.dmp".
+
+There is an UI to upload the mini-dump to a TDF server but of course
+that only makes sense if the server has symbols available that match
+the build, which is not the case if you have built LO yourself.
+
+If you want to get the backtrace from local mini-dump files:
+
+* with Visual Studio:
+ 1. open the *.dmp file from the Visual Studio IDE File->Open->File
+ 2. then click "Debug Native Only"
+
+* otherwise:
+ 1. run "make symbols" to extract the debuginfo from the binaries
+ 2. run "workdir/UnpackedTarball/breakpad/src/processor/minidump_stackwalk
foo.dmp workdir/symbols"
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/formulacell.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 00f17500520bcb2634146496adc8de9f4d28eea5
Author: Eike Rathke
Date: Fri Jan 6 16:55:32 2017 +0100
out of bounds string access
Change-Id: Iecbe24f90cefe34a447cd52a44967a4b09b4394b
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 06fc6b1..9398159 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1355,7 +1355,7 @@ void ScFormulaCell::CompileXML(
sc::CompileFormulaContext& rCxt, ScProgress& rPr
{
if ( !pCode->GetLen() )
{
-if ( aFormula[0] == '=' )
+if ( !aFormula.isEmpty() && aFormula[0] == '=' )
pCode->AddBad( aFormula.copy( 1 ) );
else
pCode->AddBad( aFormula );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/tdf105143.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |8
writerfilter/source/filter/WriterFilter.cxx |1 +
3 files changed, 9 insertions(+)
New commits:
commit 3753e2010d0acd5f4ff25e2cb75a33cb580d310f
Author: Miklos Vajna
Date: Fri Jan 6 13:49:06 2017 +0100
tdf#105143 DOCX import: enable DoNotCaptureDrawObjsOnPage layout compat
option
Because that's what Word does to show only part of the shape in the
bugdoc.
Conflicts:
writerfilter/source/filter/WriterFilter.cxx
Change-Id: Ic5cb84cace9237671d71eda0c64e9dadfe244cb9
Reviewed-on: https://gerrit.libreoffice.org/32782
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/ooxmlimport/data/tdf105143.docx
b/sw/qa/extras/ooxmlimport/data/tdf105143.docx
new file mode 100644
index 000..aa4bf40
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf105143.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 097b749..7168d17 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1740,6 +1740,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf105127, "tdf105127.docx")
CPPUNIT_ASSERT_EQUAL(static_cast(3257),
aPolyPolygon.Coordinates[0][0].Y);
}
+DECLARE_OOXMLIMPORT_TEST(testTdf105143, "tdf105143.docx")
+{
+OUString aTop =
parseDump("/root/page/body/txt/anchored/SwAnchoredDrawObject/bounds", "top");
+// This was 6272, i.e. the shape was moved up (incorrect position) to be
+// inside the page rectangle.
+CPPUNIT_ASSERT_EQUAL(OUString("6674"), aTop);
+}
+
DECLARE_OOXMLIMPORT_TEST(testfdo76583, "fdo76583.docx")
{
// The problem was that the floating table was imported as a non-floating
one.
diff --git a/writerfilter/source/filter/WriterFilter.cxx
b/writerfilter/source/filter/WriterFilter.cxx
index 1ab28c2..0b95b45 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -300,6 +300,7 @@ void WriterFilter::setTargetDocument(const uno::Reference<
lang::XComponent >& x
xSettings->setPropertyValue("BackgroundParaOverDrawings",
uno::makeAny(sal_True));
xSettings->setPropertyValue("TabOverMargin", uno::makeAny(sal_True));
xSettings->setPropertyValue("PropLineSpacingShrinksFirstLine",
uno::makeAny(sal_True));
+xSettings->setPropertyValue("DoNotCaptureDrawObjsOnPage",
uno::makeAny(sal_True));
}
void WriterFilter::setSourceDocument(const uno::Reference< lang::XComponent >&
xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException,
std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/tdf105143.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |8
writerfilter/source/filter/WriterFilter.cxx |1 +
3 files changed, 9 insertions(+)
New commits:
commit af313fc149f80adb0f1680ca20e19745ccb7fede
Author: Miklos Vajna
Date: Fri Jan 6 13:49:06 2017 +0100
tdf#105143 DOCX import: enable DoNotCaptureDrawObjsOnPage layout compat
option
Because that's what Word does to show only part of the shape in the
bugdoc.
Change-Id: Ic5cb84cace9237671d71eda0c64e9dadfe244cb9
Reviewed-on: https://gerrit.libreoffice.org/32782
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/ooxmlimport/data/tdf105143.docx
b/sw/qa/extras/ooxmlimport/data/tdf105143.docx
new file mode 100644
index 000..aa4bf40
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf105143.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0acf8f0..2d1c66b 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -699,6 +699,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf105127, "tdf105127.docx")
CPPUNIT_ASSERT_EQUAL(static_cast(3257),
aPolyPolygon.Coordinates[0][0].Y);
}
+DECLARE_OOXMLIMPORT_TEST(testTdf105143, "tdf105143.docx")
+{
+OUString aTop =
parseDump("/root/page/body/txt/anchored/SwAnchoredDrawObject/bounds", "top");
+// This was 6272, i.e. the shape was moved up (incorrect position) to be
+// inside the page rectangle.
+CPPUNIT_ASSERT_EQUAL(OUString("6674"), aTop);
+}
+
DECLARE_OOXMLIMPORT_TEST(testfdo76583, "fdo76583.docx")
{
// The problem was that the floating table was imported as a non-floating
one.
diff --git a/writerfilter/source/filter/WriterFilter.cxx
b/writerfilter/source/filter/WriterFilter.cxx
index 3826b09..e247000 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -298,6 +298,7 @@ void WriterFilter::setTargetDocument(const uno::Reference<
lang::XComponent >& x
xSettings->setPropertyValue("TabOverMargin", uno::makeAny(true));
xSettings->setPropertyValue("TreatSingleColumnBreakAsPageBreak",
uno::makeAny(true));
xSettings->setPropertyValue("PropLineSpacingShrinksFirstLine",
uno::makeAny(true));
+xSettings->setPropertyValue("DoNotCaptureDrawObjsOnPage",
uno::makeAny(true));
}
void WriterFilter::setSourceDocument(const uno::Reference< lang::XComponent >&
xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException,
std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - oox/source sw/qa
oox/source/vml/vmlshape.cxx | 22 ++
sw/qa/extras/ooxmlimport/data/tdf105127.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |7 +++
3 files changed, 29 insertions(+)
New commits:
commit 86847b02c581e908b5aae1cb13be7dba0e40e180
Author: Miklos Vajna
Date: Fri Jan 6 09:42:20 2017 +0100
tdf#105127 VML import: handle
I don't see an easy way to implement this via UNO, so use the internal
API. As to the internal API usage,
SdrEditView::MirrorMarkedObjVertical() (for UI) and
SvxMSDffManager::ImportShape() (for WW8 import) are example client code.
Change-Id: I9bf27788db32fd35d6b56e0f1a240c4b7abc5604
(cherry picked from commit ac03883cd66a2d58c17c8dac555a053586e46625)
Reviewed-on: https://gerrit.libreoffice.org/32778
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index c978c39..0b68675 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -1058,6 +1058,28 @@ Reference< XShape > BezierShape::implConvertAndInsert(
const Reference< XShapes
aPropSet.setProperty( PROP_PolyPolygonBezier, aBezierCoords );
}
+// Handle horizontal and vertical flip.
+if (!maTypeModel.maFlip.isEmpty())
+{
+if (SdrObject* pShape = GetSdrObjectFromXShape(xShape))
+{
+if (maTypeModel.maFlip.startsWith("x"))
+{
+Point aCenter(pShape->GetSnapRect().Center());
+Point aPoint2(aCenter);
+aPoint2.setY(aPoint2.getY() + 1);
+pShape->NbcMirror(aCenter, aPoint2);
+}
+if (maTypeModel.maFlip.endsWith("y"))
+{
+Point aCenter(pShape->GetSnapRect().Center());
+Point aPoint2(aCenter);
+aPoint2.setX(aPoint2.getX() + 1);
+pShape->NbcMirror(aCenter, aPoint2);
+}
+}
+}
+
// Hacky way of ensuring the shape is correctly sized/positioned
xShape->setSize( awt::Size( rShapeRect.Width, rShapeRect.Height ) );
xShape->setPosition( awt::Point( rShapeRect.X, rShapeRect.Y ) );
diff --git a/sw/qa/extras/ooxmlimport/data/tdf105127.docx
b/sw/qa/extras/ooxmlimport/data/tdf105127.docx
new file mode 100644
index 000..3cdfa7f
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf105127.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index b1ccafc..0acf8f0 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -692,6 +692,13 @@ DECLARE_OOXMLIMPORT_TEST(testBnc779620, "bnc779620.docx")
lcl_countTextFrames( mxComponent, 1 );
}
+DECLARE_OOXMLIMPORT_TEST(testTdf105127, "tdf105127.docx")
+{
+auto aPolyPolygon =
getProperty(getShape(1), "PolyPolygonBezier");
+// This was 1910, the shape was rendered upside down.
+CPPUNIT_ASSERT_EQUAL(static_cast(3257),
aPolyPolygon.Coordinates[0][0].Y);
+}
+
DECLARE_OOXMLIMPORT_TEST(testfdo76583, "fdo76583.docx")
{
// The problem was that the floating table was imported as a non-floating
one.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/headless
vcl/headless/svpbmp.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 600f22fa3e718c36f3d8f47710df1dbbe0d0c4c2
Author: Caolán McNamara
Date: Fri Jan 6 13:46:53 2017 +
use same logic in both Creates
Change-Id: I49dab360c5f93e40f5a6e91fbe721935d795472c
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index e7d367a..d11f3b9 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -121,7 +121,7 @@ BitmapBuffer* ImplCreateDIB(
pDIB->maPalette.SetEntryCount( nColors );
}
-size_t size = pDIB->mnScanlineSize * pDIB->mnHeight;
+const size_t size = pDIB->mnScanlineSize * pDIB->mnHeight;
if (size > SAL_MAX_INT32)
{
delete pDIB;
@@ -176,10 +176,18 @@ bool SvpSalBitmap::Create(const SalBitmap& rBmp)
{
// TODO: reference counting...
mpDIB = new BitmapBuffer( *rSalBmp.mpDIB );
+
+const size_t size = mpDIB->mnScanlineSize * mpDIB->mnHeight;
+if (size > SAL_MAX_INT32)
+{
+delete mpDIB;
+mpDIB = nullptr;
+return false;
+}
+
// TODO: get rid of this when BitmapBuffer gets copy constructor
try
{
-size_t size = mpDIB->mnScanlineSize * mpDIB->mnHeight;
mpDIB->mpBits = new sal_uInt8[size];
std::memcpy(mpDIB->mpBits, rSalBmp.mpDIB->mpBits, size);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/unixODBC
external/unixODBC/inc/odbc/sql.h | 52 +++
1 file changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 2574757cf026cee4d45195a2f37ecde566411654
Author: Michael Stahl
Date: Fri Jan 6 12:49:42 2017 +0100
unixODBC: revert nonsensical trival change 622bb4bc
There is no point to trivial cleanups in external headers.
Change-Id: I9cb7ba135655e1426dcafd3a621ab4eaa7da1011
diff --git a/external/unixODBC/inc/odbc/sql.h b/external/unixODBC/inc/odbc/sql.h
index f426dca..6d1e160 100644
--- a/external/unixODBC/inc/odbc/sql.h
+++ b/external/unixODBC/inc/odbc/sql.h
@@ -468,12 +468,12 @@ extern "C" {
/* SQL_ALTER_TABLE bitmasks */
#if (ODBCVER >= 0x0200)
-#define SQL_AT_ADD_COLUMN 0x0001
-#define SQL_AT_DROP_COLUMN 0x0002
+#define SQL_AT_ADD_COLUMN 0x0001L
+#define SQL_AT_DROP_COLUMN 0x0002L
#endif /* ODBCVER >= 0x0200 */
#if (ODBCVER >= 0x0300)
-#define SQL_AT_ADD_CONSTRAINT 0x0008
+#define SQL_AT_ADD_CONSTRAINT 0x0008L
/* The following bitmasks are ODBC extensions and defined in sqlext.h
*#defineSQL_AT_COLUMN_SINGLE0x0020L
@@ -508,16 +508,16 @@ extern "C" {
#define SQL_CB_PRESERVE 2
/* SQL_FETCH_DIRECTION bitmasks */
-#define SQL_FD_FETCH_NEXT 0x0001
-#define SQL_FD_FETCH_FIRST 0x0002
-#define SQL_FD_FETCH_LAST 0x0004
-#define SQL_FD_FETCH_PRIOR 0x0008
-#define SQL_FD_FETCH_ABSOLUTE 0x0010
-#define SQL_FD_FETCH_RELATIVE 0x0020
+#define SQL_FD_FETCH_NEXT 0x0001L
+#define SQL_FD_FETCH_FIRST 0x0002L
+#define SQL_FD_FETCH_LAST 0x0004L
+#define SQL_FD_FETCH_PRIOR 0x0008L
+#define SQL_FD_FETCH_ABSOLUTE 0x0010L
+#define SQL_FD_FETCH_RELATIVE 0x0020L
/* SQL_GETDATA_EXTENSIONS bitmasks */
-#define SQL_GD_ANY_COLUMN 0x0001
-#define SQL_GD_ANY_ORDER0x0002
+#define SQL_GD_ANY_COLUMN 0x0001L
+#define SQL_GD_ANY_ORDER0x0002L
/* SQL_IDENTIFIER_CASE values */
#define SQL_IC_UPPER1
@@ -530,20 +530,20 @@ extern "C" {
#if (ODBCVER >= 0x0201)
-#define SQL_OJ_LEFT 0x0001
-#define SQL_OJ_RIGHT0x0002
-#define SQL_OJ_FULL 0x0004
-#define SQL_OJ_NESTED 0x0008
-#define SQL_OJ_NOT_ORDERED 0x0010
-#define SQL_OJ_INNER0x0020
-#define SQL_OJ_ALL_COMPARISON_OPS 0x0040
+#define SQL_OJ_LEFT 0x0001L
+#define SQL_OJ_RIGHT0x0002L
+#define SQL_OJ_FULL 0x0004L
+#define SQL_OJ_NESTED 0x0008L
+#define SQL_OJ_NOT_ORDERED 0x0010L
+#define SQL_OJ_INNER0x0020L
+#define SQL_OJ_ALL_COMPARISON_OPS 0x0040L
#endif
/* SQL_SCROLL_CONCURRENCY bitmasks */
-#define SQL_SCCO_READ_ONLY 0x0001
-#define SQL_SCCO_LOCK 0x0002
-#define SQL_SCCO_OPT_ROWVER 0x0004
-#define SQL_SCCO_OPT_VALUES 0x0008
+#define SQL_SCCO_READ_ONLY 0x0001L
+#define SQL_SCCO_LOCK 0x0002L
+#define SQL_SCCO_OPT_ROWVER 0x0004L
+#define SQL_SCCO_OPT_VALUES 0x0008L
/* SQL_TXN_CAPABLE values */
#define SQL_TC_NONE 0
@@ -553,13 +553,13 @@ extern "C" {
#define SQL_TC_DDL_IGNORE 4
/* SQL_TXN_ISOLATION_OPTION bitmasks */
-#define SQL_TXN_READ_UNCOMMITTED0x0001
+#define SQL_TXN_READ_UNCOMMITTED0x0001L
#define SQL_TRANSACTION_READ_UNCOMMITTEDSQL_TXN_READ_UNCOMMITTED
-#define SQL_TXN_READ_COMMITTED 0x0002
+#define SQL_TXN_READ_COMMITTED 0x0002L
#define SQL_TRANSACTION_READ_COMMITTED SQL_TXN_READ_COMMITTED
-#define SQL_TXN_REPEATABLE_READ 0x0004
+#define SQL_TXN_REPEATABLE_READ 0x0004L
#define SQL_TRANSACTION_REPEATABLE_READ SQL_TXN_REPEATABLE_READ
-#define SQL_TXN_SERIALIZABLE0x0008
+#define SQL_TXN_SERIALIZABLE0x0008L
#define SQL_TRANSACTION_SERIALIZABLESQL_TXN_SERIALIZABLE
/* SQL_NULL_COLLATION values */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - oox/source sw/qa
oox/source/vml/vmlshape.cxx | 22 ++
sw/qa/extras/ooxmlimport/data/tdf105127.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |7 +++
3 files changed, 29 insertions(+)
New commits:
commit 552052d4fe59e4fc0449b8c419cb40582f5c34dc
Author: Miklos Vajna
Date: Fri Jan 6 09:42:20 2017 +0100
tdf#105127 VML import: handle
I don't see an easy way to implement this via UNO, so use the internal
API. As to the internal API usage,
SdrEditView::MirrorMarkedObjVertical() (for UI) and
SvxMSDffManager::ImportShape() (for WW8 import) are example client code.
Change-Id: I9bf27788db32fd35d6b56e0f1a240c4b7abc5604
(cherry picked from commit ac03883cd66a2d58c17c8dac555a053586e46625)
Reviewed-on: https://gerrit.libreoffice.org/32781
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 7473141..af02bac 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -1074,6 +1074,28 @@ Reference< XShape > BezierShape::implConvertAndInsert(
const Reference< XShapes
aPropSet.setProperty( PROP_PolyPolygonBezier, aBezierCoords );
}
+// Handle horizontal and vertical flip.
+if (!maTypeModel.maFlip.isEmpty())
+{
+if (SdrObject* pShape = GetSdrObjectFromXShape(xShape))
+{
+if (maTypeModel.maFlip.startsWith("x"))
+{
+Point aCenter(pShape->GetSnapRect().Center());
+Point aPoint2(aCenter);
+aPoint2.setY(aPoint2.getY() + 1);
+pShape->NbcMirror(aCenter, aPoint2);
+}
+if (maTypeModel.maFlip.endsWith("y"))
+{
+Point aCenter(pShape->GetSnapRect().Center());
+Point aPoint2(aCenter);
+aPoint2.setX(aPoint2.getX() + 1);
+pShape->NbcMirror(aCenter, aPoint2);
+}
+}
+}
+
// Hacky way of ensuring the shape is correctly sized/positioned
xShape->setSize( awt::Size( rShapeRect.Width, rShapeRect.Height ) );
xShape->setPosition( awt::Point( rShapeRect.X, rShapeRect.Y ) );
diff --git a/sw/qa/extras/ooxmlimport/data/tdf105127.docx
b/sw/qa/extras/ooxmlimport/data/tdf105127.docx
new file mode 100644
index 000..3cdfa7f
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf105127.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 1a457c3..097b749 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1733,6 +1733,13 @@ DECLARE_OOXMLIMPORT_TEST(testBnc779620, "bnc779620.docx")
lcl_countTextFrames( mxComponent, 1 );
}
+DECLARE_OOXMLIMPORT_TEST(testTdf105127, "tdf105127.docx")
+{
+auto aPolyPolygon =
getProperty(getShape(1), "PolyPolygonBezier");
+// This was 1910, the shape was rendered upside down.
+CPPUNIT_ASSERT_EQUAL(static_cast(3257),
aPolyPolygon.Coordinates[0][0].Y);
+}
+
DECLARE_OOXMLIMPORT_TEST(testfdo76583, "fdo76583.docx")
{
// The problem was that the floating table was imported as a non-floating
one.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/ado/AConnection.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit b397c4b8cb9f1a0f2182f1d4b480bf77951aa68f
Author: Stephan Bergmann
Date: Fri Jan 6 12:34:15 2017 +0100
bSilent is unused
...ever since c25ec0608a167bcf1d891043f02273761c351701 "initial import"
Change-Id: Iccee867aa9722ced2f66d4d8b8911c5e191502c2
diff --git a/connectivity/source/drivers/ado/AConnection.cxx
b/connectivity/source/drivers/ado/AConnection.cxx
index d5a2a60..15432c3 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -108,15 +108,12 @@ void OConnection::construct(const OUString& url,const
Sequence< PropertyValue >&
aDSN = aDSN.copy(7);
sal_Int32 nTimeout = 20;
-bool bSilent = true;
const PropertyValue *pIter = info.getConstArray();
const PropertyValue *pEnd = pIter + info.getLength();
for(;pIter != pEnd;++pIter)
{
if(pIter->Name == "Timeout")
pIter->Value >>= nTimeout;
-else if(pIter->Name == "Silent")
-pIter->Value >>= bSilent;
else if(pIter->Name == "user")
pIter->Value >>= aUID;
else if(pIter->Name == "password")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - 4 commits - loleaflet/dist loleaflet/main.js loleaflet/src
loleaflet/dist/toolbar/toolbar.js | 52 ++
loleaflet/main.js |5 +++
loleaflet/src/control/Toolbar.js |9 ++
3 files changed, 66 insertions(+)
New commits:
commit 02247243163b56478137d7b114bef4d014ea6a1b
Author: Henry Castro
Date: Wed Dec 28 13:44:49 2016 -0400
tdf#103642 Page refresh causes unwanted error message
(cherry picked from commit 9c64db3ad1d60c4de659d779a4fba17a298ed648)
Signed-off-by: Andras Timar
diff --git a/loleaflet/main.js b/loleaflet/main.js
index bd9dd1d..27ca498 100644
--- a/loleaflet/main.js
+++ b/loleaflet/main.js
@@ -114,4 +114,9 @@ map.addControl(L.control.rowHeader());
map.addControl(L.control.contextMenu());
map.addControl(L.control.menubar());
+window.addEventListener('beforeunload', function () {
+ if (global.map && global.map._socket) {
+ global.map._socket.close();
+ }
+});
//require('./dist/toolbar/toolbar');
commit 6ca3ec8d6ccec19bf7519d24e989245ae7f160e7
Author: Henry Castro
Date: Thu Dec 22 13:41:26 2016 -0400
tdf#103779: Help menu accessibility
(cherry picked from commit 1bede62b132e61fa847aaf066447c2670d14dbab)
Signed-off-by: Andras Timar
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 8ad990a..466d698 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -215,6 +215,8 @@ L.Map.include({
translatableContent[i].firstChild.nodeValue =
translatableContent[i].firstChild.nodeValue.toLocaleString();
}
+ $('.vex-content').attr('tabindex', -1);
+ $('.vex-content').focus();
// workaround for
https://github.com/HubSpot/vex/issues/43
$('.vex-overlay').css({
'pointer-events': 'none'});
$('.vex').click(function() {
@@ -223,6 +225,9 @@ L.Map.include({
$('.vex-content').click(function(e) {
e.stopPropagation();
});
+ },
+ beforeClose: function () {
+ map.focus();
}
});
});
@@ -245,6 +250,7 @@ L.Map.include({
contentCSS: { width: w + 'px'},
buttons: {},
afterOpen: function($vexContent) {
+ map.enable(false);
// workaround for
https://github.com/HubSpot/vex/issues/43
$('.vex-overlay').css({ 'pointer-events':
'none'});
$('.vex').click(function() {
@@ -253,6 +259,9 @@ L.Map.include({
$('.vex-content').click(function(e) {
e.stopPropagation();
});
+ },
+ beforeClose: function () {
+ map.enable(true);
}
});
}
commit 1e12ab5607615ceef1408861771836a838452323
Author: Henry Castro
Date: Wed Dec 21 19:50:04 2016 -0400
tdf#103775: Font color/Highlighting button issue
(cherry picked from commit 65bfc63ace567501912e4b6399ff8f81cc62516e)
Signed-off-by: Andras Timar
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index b864ee9..2d4160d 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -407,6 +407,28 @@ $(function () {
if (!L.DomUtil.get('fontcolorindicator')) {
var fontColorIndicator =
L.DomUtil.create('div', 'font-color-indicator',
L.DomUtil.get('tb_toolbar-up_item_fontcolor'));
fontColorIndicator.id = 'fontcolorindicator';
+ L.DomEvent.on(fontColorIndicator, 'mouseover',
function () {
+ var button =
fontColorIndicator.parentNode.firstChild;
+ $(button).addClass('over');
+ });
+ L.DomEvent.on(fontColorIndicator, 'mouseout',
function () {
+ var button =
fontColorIndicator.parentNode.firstChild;
+ $(button).removeClass('over');
+ });
+ L.DomEvent.on(fontColorIndicator, 'mousedown',
function () {
+ var button =
fontColorIndicator.parentNode.firstChild;
+
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - de/091ad1b8abb5d4fb2d7ea1cc2a90b6c1bad236
de/091ad1b8abb5d4fb2d7ea1cc2a90b6c1bad236 |1 + 1 file changed, 1 insertion(+) New commits: commit 2040ccfd0c6a84b58e5a6f2faa01676d7503e0b5 Author: Caolán McNamara Date: Fri Jan 6 11:06:06 2017 + Notes added by 'git notes add' diff --git a/de/091ad1b8abb5d4fb2d7ea1cc2a90b6c1bad236 b/de/091ad1b8abb5d4fb2d7ea1cc2a90b6c1bad236 new file mode 100644 index 000..e4e62f3 --- /dev/null +++ b/de/091ad1b8abb5d4fb2d7ea1cc2a90b6c1bad236 @@ -0,0 +1 @@ +prefer: 0e082ac24bfb4e6924539e4814901ce814880737 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f3/71d243a59ba61e1cb282c2f9363adac52a188e
f3/71d243a59ba61e1cb282c2f9363adac52a188e |1 + 1 file changed, 1 insertion(+) New commits: commit cd0ca0f36eede5cb55fc660e63332b138639a1fd Author: Caolán McNamara Date: Fri Jan 6 11:04:14 2017 + Notes added by 'git notes add' diff --git a/f3/71d243a59ba61e1cb282c2f9363adac52a188e b/f3/71d243a59ba61e1cb282c2f9363adac52a188e new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/f3/71d243a59ba61e1cb282c2f9363adac52a188e @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a8/3a5905776f6192e741a222297eeda0819814b4
a8/3a5905776f6192e741a97eeda0819814b4 |1 + 1 file changed, 1 insertion(+) New commits: commit dc3ad1e78b43ac50631416ccc404c464e27069ac Author: Caolán McNamara Date: Fri Jan 6 11:03:50 2017 + Notes added by 'git notes add' diff --git a/a8/3a5905776f6192e741a97eeda0819814b4 b/a8/3a5905776f6192e741a97eeda0819814b4 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/a8/3a5905776f6192e741a97eeda0819814b4 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 25/8c5336495c330e41bc259481ffa253589ff31c
25/8c5336495c330e41bc259481ffa253589ff31c |1 + 1 file changed, 1 insertion(+) New commits: commit 978bdf4ef1081f1ceccbfc4bccfb7179a53adcef Author: Caolán McNamara Date: Fri Jan 6 11:03:30 2017 + Notes added by 'git notes add' diff --git a/25/8c5336495c330e41bc259481ffa253589ff31c b/25/8c5336495c330e41bc259481ffa253589ff31c new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/25/8c5336495c330e41bc259481ffa253589ff31c @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2d/dbf071356df6dba6954b8c0540793611a60560
2d/dbf071356df6dba6954b8c0540793611a60560 |1 + 1 file changed, 1 insertion(+) New commits: commit 774f0247c9c015db995f8d3779c727d6b59b422d Author: Caolán McNamara Date: Fri Jan 6 11:03:09 2017 + Notes added by 'git notes add' diff --git a/2d/dbf071356df6dba6954b8c0540793611a60560 b/2d/dbf071356df6dba6954b8c0540793611a60560 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/2d/dbf071356df6dba6954b8c0540793611a60560 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/igif/gifread.cxx | 13 -
1 file changed, 4 insertions(+), 9 deletions(-)
New commits:
commit 22e1fc5402c17c8459873e621f7630674d2b98f1
Author: Caolán McNamara
Date: Fri Jan 6 10:32:56 2017 +
lsan+wmffuzzer shows a circular reference leading to a leak
graphic gets a context set on it which has a shallow copy
of the graphic in it.
==37==ERROR: LeakSanitizer: detected memory leaks
Indirect leak of 1024 byte(s) in 1 object(s) allocated from:
#0 0x6170b0 in operator new[](unsigned long)
/src/llvm/projects/compiler-rt/lib/asan/asan_new_delete.cc:84
#1 0x91361b in BitmapPalette::BitmapPalette(unsigned short)
/src/libreoffice/include/vcl/salbtype.hxx:467:56
#2 0x9029f0 in GIFReader::GIFReader(SvStream&)
/src/libreoffice/vcl/source/filter/igif/gifread.cxx:114:7
#3 0x91648d in
std::__1::__libcpp_compressed_pair_imp,
GIFReader, 1u>::__libcpp_compressed_pair_imp&,
SvStream&, 0ul, 0ul>(std::__1::piecewise_construct_t,
std::__1::tuple&>, std::__1::tuple,
std::__1::__tuple_indices<0ul>, std::__1::__tuple_indices<0ul>)
/usr/local/bin/../include/c++/v1/memory:2173:15
#4 0x91648d in
std::__1::__compressed_pair,
GIFReader>::__compressed_pair&,
SvStream&>(std::__1::piecewise_construct_t,
std::__1::tuple&>, std::__1::tuple)
/usr/local/bin/../include/c++/v1/memory:2330
#5 0x91648d in std::__1::__shared_ptr_emplace
>::__shared_ptr_emplace(std::__1::allocator, SvStream&)
/usr/local/bin/../include/c++/v1/memory:3827
#6 0x91648d in std::__1::shared_ptr
std::__1::shared_ptr::make_shared(SvStream&)
/usr/local/bin/../include/c++/v1/memory:4443
#7 0x91284b in
_ZNSt3__111make_sharedI9GIFReaderJR8SvStreamEEENS_9enable_ifIXntsr8is_arrayIT_EE5valueENS_10shared_ptrIS5_EEE4typeEDpOT0_
/usr/local/bin/../include/c++/v1/memory:4807:12
#8 0x91284b in ImportGIF(SvStream&, Graphic&)
/src/libreoffice/vcl/source/filter/igif/gifread.cxx:889
#9 0x61c85c in LLVMFuzzerTestOneInput
/src/libreoffice/vcl/workben/giffuzzer.cxx:18:11
#10 0x575ef58 in fuzzer::Fuzzer::ExecuteCallback(unsigned char const*,
unsigned long) /src/libfuzzer/FuzzerLoop.cpp:546:13
#11 0x575fcb4 in fuzzer::Fuzzer::RunOne(unsigned char const*, unsigned
long) /src/libfuzzer/FuzzerLoop.cpp:497:3
#12 0x577e43a in fuzzer::Fuzzer::RunOne(std::__1::vector > const&)
/src/libfuzzer/FuzzerInternal.h:119:41
#13 0x575e5ad in
fuzzer::Fuzzer::ShuffleAndMinimize(std::__1::vector >,
std::__1::allocator > > >*) /src/libfuzzer/FuzzerLoop.cpp:476:30
#14 0x5708588 in fuzzer::FuzzerDriver(int*, char***, int (*)(unsigned
char const*, unsigned long)) /src/libfuzzer/FuzzerDriver.cpp:534:6
#15 0x56fb3c8 in main /src/libfuzzer/FuzzerMain.cpp:20:10
#16 0x7fb5f13da82f in __libc_start_main
(/lib/x86_64-linux-gnu/libc.so.6+0x2082f)
Change-Id: I1384f4ced094e79a27e7d15b569c88f129cd115a
diff --git a/vcl/source/filter/igif/gifread.cxx
b/vcl/source/filter/igif/gifread.cxx
index 4cd2994..3789ebb 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -49,7 +49,6 @@ class SvStream;
class GIFReader : public GraphicReader
{
-Graphic aImGraphic;
Animation aAnimation;
Bitmap aBmp8;
Bitmap aBmp1;
@@ -103,10 +102,9 @@ class GIFReader : public GraphicReader
public:
ReadState ReadGIF( Graphic& rGraphic );
-const Graphic& GetIntermediateGraphic();
+Graphic GetIntermediateGraphic();
explicitGIFReader( SvStream& rStm );
-virtual ~GIFReader() override;
};
GIFReader::GIFReader( SvStream& rStm )
@@ -145,11 +143,6 @@ GIFReader::GIFReader( SvStream& rStm )
ClearImageExtensions();
}
-GIFReader::~GIFReader()
-{
-aImGraphic.SetContext( nullptr );
-}
-
void GIFReader::ClearImageExtensions()
{
nGCDisposalMethod = 0;
@@ -651,8 +644,10 @@ void GIFReader::CreateNewBitmaps()
}
}
-const Graphic& GIFReader::GetIntermediateGraphic()
+Graphic GIFReader::GetIntermediateGraphic()
{
+Graphic aImGraphic;
+
// only create intermediate graphic, if data is available
// but graphic still not completely read
if ( bImGraphicReady && !aAnimation.Count() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/title_page.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 65af088bf1a712cd234e0e97e2820c44f6327f81 Author: Olivier Date: Fri Jan 6 08:53:44 2017 -0200 Better wording for title pages help page Change-Id: Idb7643131803708206c04382d7b2520610216ad1 Reviewed-on: https://gerrit.libreoffice.org/32780 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/source/text/swriter/01/title_page.xhp b/source/text/swriter/01/title_page.xhp index f442f5f..7be6d9d 100644 --- a/source/text/swriter/01/title_page.xhp +++ b/source/text/swriter/01/title_page.xhp @@ -49,7 +49,7 @@ Many documents, such as letters and reports, have a first page that is different from the other pages in the document. For example, the first page of a letterhead typically has a different header or the first page of a report might have no header or footer, while the other pages do. This is simple to achieve with %PRODUCTNAME Writer. Page header and footer, numbering, margins and orientation are some of the properties that belongs to page styles. %PRODUCTNAME Writer let your to insert a blank title page at any point of your document, or format an existing page like a title page, by inserting a page break followed by a page style of your choice or by changing the page style at cursor position. -Note: Using the Default (or any other) page style for your document, you can add a header/footer as you wish to the first page by deselecting the Same content on first page option on the header/footer pages in the Page Style dialog, and then adding the header/footer. You can then add a different header/footer to the other pages of the document. +Note: Using the Default (or any other) page style for your document, you can add a header or footer as you wish to the first page by deselecting the Same content on first page option on the header/footer tabs in the Page Style dialog, and then adding the header or footer. You can then add a different header or footer to the other pages of the document. To convert the first page of the document into a title page @@ -64,7 +64,7 @@ Select Converting existing pages to title pages -Select the style of the title page in the Edit page property area +Select the style of the title page in the Edit Page Properties area Note: By default, %PRODUCTNAME selects the First page page style. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0a4c1ed2e8b1f443a12a185b2da5ceea46a1038c Author: Olivier Date: Fri Jan 6 08:53:44 2017 -0200 Updated core Project: help 65af088bf1a712cd234e0e97e2820c44f6327f81 Better wording for title pages help page Change-Id: Idb7643131803708206c04382d7b2520610216ad1 Reviewed-on: https://gerrit.libreoffice.org/32780 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d2ff85a..65af088 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d2ff85a3942838ae72e4d7abced5e94e6d275225 +Subproject commit 65af088bf1a712cd234e0e97e2820c44f6327f81 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: News on Xcode IDE, libre office now loads as 1 project, with modules etc.
Le 05/01/2017 à 19:23, jan iversen a écrit : Hi Jan, Thanks for your input, I'll try the make gbuildtojson again and send you the zipped output from workdir/gbuildjson as requested. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: libreofficekit/qa
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 22 +++-
1 file changed, 8 insertions(+), 14 deletions(-)
New commits:
commit 29f697711e06b88fb8387518e7f8440cf49f0933
Author: Pranav Kant
Date: Fri Jan 6 15:57:43 2017 +0530
gtktiledviewer: Lets avoid using manual buffer sizes
Change-Id: I76e70ccb5b1f40193a1eda1cbca19b3444168dae
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 3382987..3c774c1 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -375,23 +375,17 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget*
pDocView, GdkEventConfi
gtk_widget_show(rWindow.m_pFormulabarEntry);
// Change horizontal alignment uno commands for spreadsheet
-const char* unoHorAlignArgs =
+const std::string argsPrefix =
"{"
"\"HorizontalAlignment\":{"
"\"type\":\"unsigned short\", "
-"\"value\":\"%d\""
-"}"
-"}";
-
-char unoHorAlignArgsFormatted[strlen(unoHorAlignArgs)];
-snprintf(unoHorAlignArgsFormatted, sizeof(unoHorAlignArgsFormatted),
unoHorAlignArgs, 1);
-lcl_registerToolItem(rWindow, rWindow.m_pLeftpara,
".uno:HorizontalAlignment", std::string(unoHorAlignArgsFormatted));
-snprintf(unoHorAlignArgsFormatted, sizeof(unoHorAlignArgsFormatted),
unoHorAlignArgs, 2);
-lcl_registerToolItem(rWindow, rWindow.m_pCenterpara,
".uno:HorizontalAlignment", std::string(unoHorAlignArgsFormatted));
-snprintf(unoHorAlignArgsFormatted, sizeof(unoHorAlignArgsFormatted),
unoHorAlignArgs, 3);
-lcl_registerToolItem(rWindow, rWindow.m_pRightpara,
".uno:HorizontalAlignment", std::string(unoHorAlignArgsFormatted));
-snprintf(unoHorAlignArgsFormatted, sizeof(unoHorAlignArgsFormatted),
unoHorAlignArgs, 4);
-lcl_registerToolItem(rWindow, rWindow.m_pJustifypara,
".uno:HorizontalAlignment", std::string(unoHorAlignArgsFormatted));
+"\"value\":\"";
+const std::string argsSuffix = "\"}}";
+
+lcl_registerToolItem(rWindow, rWindow.m_pLeftpara,
".uno:HorizontalAlignment", argsPrefix + std::to_string(1) + argsSuffix);
+lcl_registerToolItem(rWindow, rWindow.m_pCenterpara,
".uno:HorizontalAlignment", argsPrefix + std::to_string(2) + argsSuffix);
+lcl_registerToolItem(rWindow, rWindow.m_pRightpara,
".uno:HorizontalAlignment", argsPrefix + std::to_string(3) + argsSuffix);
+lcl_registerToolItem(rWindow, rWindow.m_pJustifypara,
".uno:HorizontalAlignment", argsPrefix + std::to_string(4) + argsSuffix);
}
return TRUE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/source connectivity/source extensions/source fpicker/source winaccessibility/source
canvas/source/directx/dx_spritecanvas.cxx |2 +-
connectivity/source/drivers/ado/AConnection.cxx |2 +-
extensions/source/ole/unoconversionutilities.hxx|2 +-
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |2 +-
winaccessibility/source/UAccCOM/MAccessible.cxx |2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit c38aa3b734a0176eedb41d8c2c40f5ac293c11ba
Author: Stephan Bergmann
Date: Fri Jan 6 11:19:42 2017 +0100
loplugin:salbool
Change-Id: I7dfd48a04e2dff1391d10acb75180711b403af9b
diff --git a/canvas/source/directx/dx_spritecanvas.cxx
b/canvas/source/directx/dx_spritecanvas.cxx
index 291c19f..16d7287 100644
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -89,7 +89,7 @@ namespace dxcanvas
awt::Rectangle aRect;
maArguments[2] >>= aRect;
-sal_Bool bIsFullscreen( false );
+bool bIsFullscreen( false );
maArguments[3] >>= bIsFullscreen;
// setup helper
diff --git a/connectivity/source/drivers/ado/AConnection.cxx
b/connectivity/source/drivers/ado/AConnection.cxx
index a61e12d..d5a2a60 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -108,7 +108,7 @@ void OConnection::construct(const OUString& url,const
Sequence< PropertyValue >&
aDSN = aDSN.copy(7);
sal_Int32 nTimeout = 20;
-sal_Bool bSilent = true;
+bool bSilent = true;
const PropertyValue *pIter = info.getConstArray();
const PropertyValue *pEnd = pIter + info.getLength();
for(;pIter != pEnd;++pIter)
diff --git a/extensions/source/ole/unoconversionutilities.hxx
b/extensions/source/ole/unoconversionutilities.hxx
index 1462997..430064f 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -794,7 +794,7 @@ void UnoConversionUtilities::anyToVariant(VARIANT*
pVariant, const Any& rAny)
}
case TypeClass_BOOLEAN:
{
-sal_Bool value;
+bool value;
if (rAny >>= value)
{
pVariant->vt = VT_BOOL;
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index e91d3fe..b4c1e9b 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -1074,7 +1074,7 @@ void VistaFilePickerImpl::impl_sta_SetControlValue(const
RequestRef& rRequest)
//case
css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_PREVIEW : // can be
ignored ... preview is supported native now !
case
css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION :
{
-sal_Bool bValue = false;
+bool bValue = false;
aValue >>= bValue;
iCustom->SetCheckButtonState(nId, bValue);
}
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx
b/winaccessibility/source/UAccCOM/MAccessible.cxx
index fd495a1..b832c53 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -2678,7 +2678,7 @@ void CMAccessible::get_OLECHARFromAny(Any& pAny, OLECHAR*
pChar)
}
case TypeClass_BOOLEAN:
{
-sal_Bool val;
+bool val;
pAny >>= val;
swprintf( pChar, L"%d", val);
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/cmdlinehelp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4654e312cfcd84d64bc844c56b3fab8594a76888
Author: Stephan Bergmann
Date: Fri Jan 6 11:18:26 2017 +0100
loplugin:nullptr
Change-Id: I279e65c2ec5fa7b3b06f01e7ef4e50ed822fcd03
diff --git a/desktop/source/app/cmdlinehelp.cxx
b/desktop/source/app/cmdlinehelp.cxx
index 89ef21a..6498ec8 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -180,7 +180,7 @@ namespace desktop
HANDLE hIn = GetStdHandle(STD_INPUT_HANDLE),
hOut = GetStdHandle(STD_OUTPUT_HANDLE),
hErr = GetStdHandle(STD_ERROR_HANDLE);
-if (hOut == NULL) // application does not have associated
standard handles
+if (hOut == nullptr) // application does not have associated
standard handles
{
STARTUPINFOA aStartupInfo;
aStartupInfo.cb = sizeof(aStartupInfo);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
New commits:
commit e2ac447b36b70c372ec3e6694ae0f20f09f2e83c
Author: Pranav Kant
Date: Fri Jan 6 14:42:27 2017 +0530
loleaflet: Make id of these toolbar items consistent with others
We assume that id of the toolbar item is lowercase(unocommand),
so lets keep it consistent too for alignment buttons.
This also makes alignment buttons toggle except for spreadsheet
where alignment of cell text happens via a different uno command,
HorizontalAlignment.
Change-Id: Ibacf06bd99435cd24b27c7870173a2519b167af1
(cherry picked from commit b22e52aa864c09b02e9e201367d231b442254aef)
Reviewed-on: https://gerrit.libreoffice.org/32776
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 8b04688..d00dbb7 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -367,10 +367,10 @@ $(function () {
{type: 'html', id: 'backcolor-html', html: ''},
{type: 'button', id: 'backcolor', img: 'backcolor',
hint: _('Highlighting')},
{type: 'break'},
- {type: 'button', id: 'alignleft', img: 'alignleft',
hint: _('Align left'), uno: 'LeftPara', unosheet: 'HorizontalAlignment
{"HorizontalAlignment":{"type":"unsigned short", "value":"1"}}'},
- {type: 'button', id: 'alignhorizontal', img:
'alignhorizontal', hint: _('Center horizontally'), uno: 'CenterPara', unosheet:
'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short",
"value":"2"}}'},
- {type: 'button', id: 'alignright', img: 'alignright',
hint: _('Align right'), uno: 'RightPara', unosheet: 'HorizontalAlignment
{"HorizontalAlignment":{"type":"unsigned short", "value":"3"}}'},
- {type: 'button', id: 'alignblock', img: 'alignblock',
hint: _('Justified'), uno: 'JustifyPara', unosheet: 'HorizontalAlignment
{"HorizontalAlignment":{"type":"unsigned short", "value":"4"}}'},
+ {type: 'button', id: 'leftpara', img: 'alignleft',
hint: _('Align left'), uno: 'LeftPara', unosheet: 'HorizontalAlignment
{"HorizontalAlignment":{"type":"unsigned short", "value":"1"}}'},
+ {type: 'button', id: 'centerpara', img:
'alignhorizontal', hint: _('Center horizontally'), uno: 'CenterPara', unosheet:
'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short",
"value":"2"}}'},
+ {type: 'button', id: 'rightpara', img: 'alignright',
hint: _('Align right'), uno: 'RightPara', unosheet: 'HorizontalAlignment
{"HorizontalAlignment":{"type":"unsigned short", "value":"3"}}'},
+ {type: 'button', id: 'justifypara', img:
'alignblock', hint: _('Justified'), uno: 'JustifyPara', unosheet:
'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short",
"value":"4"}}'},
{type: 'break', id: 'wraptextseparator'},
{type: 'button', id: 'wraptext', img: 'wraptext',
hint: _('Wrap Text'), uno: 'WrapText'},
{type: 'button', id: 'togglemergecells', img:
'togglemergecells', hint: _('Merge and Center Cells'), uno: 'ToggleMergeCells'},
@@ -587,6 +587,11 @@ function toLocalePattern (pattern, regex, text, sub1,
sub2) {
return text;
}
+function unoCmdToToolbarId(commandname)
+{
+ return commandname.toLowerCase().substr(5);
+}
+
function selectItem(item, func)
{
var index = -1;
@@ -880,6 +885,7 @@ map.on('commandstatechanged', function (e) {
var found = false;
var value, color, div;
var matches;
+
if (commandName === '.uno:AssignLayout') {
$('.styles-select').val(state).trigger('change');
} else if (commandName === '.uno:StyleApply') {
@@ -1023,7 +1029,7 @@ map.on('commandstatechanged', function (e) {
$('#PageStatus').html(state ? state :
' ');
}
- var id = commandName.toLowerCase().substr(5);
+ var id = unoCmdToToolbarId(commandName);
if (typeof formatButtons[id] !== 'undefined') {
if (state === 'true') {
toolbar.enable(id);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/cmdlinehelp.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit b12b4fdaf63dd4ae350cf95b5d89a9dbad107abd
Author: Stephan Bergmann
Date: Fri Jan 6 11:18:02 2017 +0100
Work around clang-cl -Werror,-Wmissing-field-initializers
...the same way as in other uses of GetStartupInfo
Change-Id: Ieeadf028d15c915df32e055e3725513b2047da4d
diff --git a/desktop/source/app/cmdlinehelp.cxx
b/desktop/source/app/cmdlinehelp.cxx
index 26ce708..89ef21a 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -182,7 +182,8 @@ namespace desktop
hErr = GetStdHandle(STD_ERROR_HANDLE);
if (hOut == NULL) // application does not have associated
standard handles
{
-STARTUPINFOA aStartupInfo{ sizeof(aStartupInfo) };
+STARTUPINFOA aStartupInfo;
+aStartupInfo.cb = sizeof(aStartupInfo);
GetStartupInfoA(&aStartupInfo);
if ((aStartupInfo.dwFlags & STARTF_USESTDHANDLES) ==
STARTF_USESTDHANDLES)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit ae5f4db452d3b82fb8b20b5bf0df44e67ac3d50a
Author: Pranav Kant
Date: Tue Dec 20 15:53:20 2016 +0530
loleaflet: Separator before 'wrap text' in calc
Change-Id: If1f4536dec24238ff1476e9e7d9ab58207d86495
(cherry picked from commit 00b5ca590bea868f9930e41823138c860c60a845)
Reviewed-on: https://gerrit.libreoffice.org/32775
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index d2f90be..8b04688 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -371,6 +371,7 @@ $(function () {
{type: 'button', id: 'alignhorizontal', img:
'alignhorizontal', hint: _('Center horizontally'), uno: 'CenterPara', unosheet:
'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short",
"value":"2"}}'},
{type: 'button', id: 'alignright', img: 'alignright',
hint: _('Align right'), uno: 'RightPara', unosheet: 'HorizontalAlignment
{"HorizontalAlignment":{"type":"unsigned short", "value":"3"}}'},
{type: 'button', id: 'alignblock', img: 'alignblock',
hint: _('Justified'), uno: 'JustifyPara', unosheet: 'HorizontalAlignment
{"HorizontalAlignment":{"type":"unsigned short", "value":"4"}}'},
+ {type: 'break', id: 'wraptextseparator'},
{type: 'button', id: 'wraptext', img: 'wraptext',
hint: _('Wrap Text'), uno: 'WrapText'},
{type: 'button', id: 'togglemergecells', img:
'togglemergecells', hint: _('Merge and Center Cells'), uno: 'ToggleMergeCells'},
{type: 'break', id: 'break-toggle'},
@@ -831,8 +832,8 @@ map.on('doclayerinit', function () {
]);
break;
case 'text':
- toolbarUp.remove('wraptext', 'togglemergecells',
'break-toggle', 'numberformatcurrency', 'numberformatpercent',
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals',
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending');
- toolbarUpMore.remove('wraptext', 'togglemergecells',
'break-toggle', 'numberformatcurrency', 'numberformatpercent',
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals',
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending');
+ toolbarUp.remove('wraptextseparator', 'wraptext',
'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending');
+ toolbarUpMore.remove('wraptextseparator', 'wraptext',
'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending');
statusbar.insert('left', [
{type: 'break', id:'break1'},
{type: 'html', id: 'StatePageNumber',
@@ -851,8 +852,8 @@ map.on('doclayerinit', function () {
case 'presentation':
var presentationToolbar = w2ui['presentation-toolbar'];
presentationToolbar.show('presentation', 'presentationbreak',
'insertpage', 'duplicatepage', 'deletepage');
- toolbarUp.remove('insertannotation', 'wraptext',
'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending');
- toolbarUpMore.remove('insertannotation', 'wraptext',
'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending');
+ toolbarUp.remove('insertannotation', 'wraptextseparator',
'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending');
+ toolbarUpMore.remove('insertannotation', 'wraptextseparator',
'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending');
statusbar.insert('left', [
{type: 'break', id:'break1'},
{type: 'html', id: 'PageStatus',
@@ -860,8
[Libreoffice-commits] core.git: libreofficekit/qa
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 19 +++
1 file changed, 19 insertions(+)
New commits:
commit 6ccd698371a8e88ea06ed0e144171dd1b6236aa7
Author: Pranav Kant
Date: Fri Jan 6 14:27:27 2017 +0530
gtktiledviewer: Override alignment buttons uno commands for calc
Use .uno:HorizontalAlignment instead of .uno:XXXPara for calc
Change-Id: I5af4fe62dc3075af4ba779499d062e6d91f21ecf
Reviewed-on: https://gerrit.libreoffice.org/32773
Reviewed-by: pranavk
Tested-by: pranavk
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 2f75a65..3382987 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -373,6 +373,25 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget*
pDocView, GdkEventConfi
gtk_widget_show(rWindow.m_pColumnBar->m_pDrawingArea);
gtk_widget_queue_draw(rWindow.m_pColumnBar->m_pDrawingArea);
gtk_widget_show(rWindow.m_pFormulabarEntry);
+
+// Change horizontal alignment uno commands for spreadsheet
+const char* unoHorAlignArgs =
+"{"
+"\"HorizontalAlignment\":{"
+"\"type\":\"unsigned short\", "
+"\"value\":\"%d\""
+"}"
+"}";
+
+char unoHorAlignArgsFormatted[strlen(unoHorAlignArgs)];
+snprintf(unoHorAlignArgsFormatted, sizeof(unoHorAlignArgsFormatted),
unoHorAlignArgs, 1);
+lcl_registerToolItem(rWindow, rWindow.m_pLeftpara,
".uno:HorizontalAlignment", std::string(unoHorAlignArgsFormatted));
+snprintf(unoHorAlignArgsFormatted, sizeof(unoHorAlignArgsFormatted),
unoHorAlignArgs, 2);
+lcl_registerToolItem(rWindow, rWindow.m_pCenterpara,
".uno:HorizontalAlignment", std::string(unoHorAlignArgsFormatted));
+snprintf(unoHorAlignArgsFormatted, sizeof(unoHorAlignArgsFormatted),
unoHorAlignArgs, 3);
+lcl_registerToolItem(rWindow, rWindow.m_pRightpara,
".uno:HorizontalAlignment", std::string(unoHorAlignArgsFormatted));
+snprintf(unoHorAlignArgsFormatted, sizeof(unoHorAlignArgsFormatted),
unoHorAlignArgs, 4);
+lcl_registerToolItem(rWindow, rWindow.m_pJustifypara,
".uno:HorizontalAlignment", std::string(unoHorAlignArgsFormatted));
}
return TRUE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: libreofficekit/qa
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 21 +++-
1 file changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 3ab6e2783bf7142729924cb95ca730404d0c54e1
Author: Pranav Kant
Date: Fri Jan 6 14:26:53 2017 +0530
gtktiledviewer: Support for posting arguments to uno commands
Change-Id: I5db217b525d0f976ef6a7840e370f8f6a21d60cb
Reviewed-on: https://gerrit.libreoffice.org/32772
Reviewed-by: pranavk
Tested-by: pranavk
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 27c8e43..2f75a65 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -121,6 +121,7 @@ public:
GtkWidget* m_pFormulabarEntry;
GtkWidget* m_pScrolledWindow;
std::map m_aToolItemCommandNames;
+std::map m_aToolItemCommandArgs;
std::map m_aCommandNameToolItems;
/// Sensitivity (enabled or disabled) or each tool item, ignoring edit
/// state.
@@ -209,6 +210,14 @@ static std::string getNextAuthor()
return std::string(pPasswd->pw_gecos) + " #" + std::to_string(++nCounter);
}
+static void lcl_registerToolItem(TiledWindow& rWindow, GtkToolItem* pItem,
const std::string& rName, const std::string& rArgs = "")
+{
+rWindow.m_aToolItemCommandNames[pItem] = rName;
+rWindow.m_aToolItemCommandArgs[pItem] = rArgs;
+rWindow.m_aCommandNameToolItems[rName] = pItem;
+rWindow.m_aToolItemSensitivities[pItem] = true;
+}
+
TiledRowColumnBar::TiledRowColumnBar(TiledBarType eType)
: m_pDrawingArea(gtk_drawing_area_new()),
m_nSizePixel(0),
@@ -396,13 +405,6 @@ gboolean TiledCornerButton::drawImpl(GtkWidget*
/*pWidget*/, cairo_t* pCairo)
return FALSE;
}
-static void lcl_registerToolItem(TiledWindow& rWindow, GtkToolItem* pItem,
const std::string& rName)
-{
-rWindow.m_aToolItemCommandNames[pItem] = rName;
-rWindow.m_aCommandNameToolItems[rName] = pItem;
-rWindow.m_aToolItemSensitivities[pItem] = true;
-}
-
const float fZooms[] = { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, 5.0 };
static void iterateUnoParams(GtkWidget* pWidget, gpointer userdata)
@@ -1332,12 +1334,13 @@ static void toggleToolItem(GtkWidget* pWidget, gpointer
/*pData*/)
LOKDocView* pLOKDocView = LOK_DOC_VIEW(rWindow.m_pDocView);
GtkToolItem* pItem = GTK_TOOL_ITEM(pWidget);
const std::string& rString = rWindow.m_aToolItemCommandNames[pItem];
-g_info("toggleToolItem: lok_doc_view_post_command('%s')",
rString.c_str());
+const std::string& rArguments = rWindow.m_aToolItemCommandArgs[pItem];
+g_info("toggleToolItem: lok_doc_view_post_command('%s %s')",
rString.c_str(), rArguments.c_str());
// notify about the finished Save
gboolean bNotify = (rString == ".uno:Save");
-lok_doc_view_post_command(pLOKDocView, rString.c_str(),
/*pArguments=*/nullptr, bNotify);
+lok_doc_view_post_command(pLOKDocView, rString.c_str(),
rArguments.c_str(), bNotify);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/vml/vmlshape.cxx | 22 ++
sw/qa/extras/ooxmlimport/data/tdf105127.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |7 +++
3 files changed, 29 insertions(+)
New commits:
commit ac03883cd66a2d58c17c8dac555a053586e46625
Author: Miklos Vajna
Date: Fri Jan 6 09:42:20 2017 +0100
tdf#105127 VML import: handle
I don't see an easy way to implement this via UNO, so use the internal
API. As to the internal API usage,
SdrEditView::MirrorMarkedObjVertical() (for UI) and
SvxMSDffManager::ImportShape() (for WW8 import) are example client code.
Change-Id: I9bf27788db32fd35d6b56e0f1a240c4b7abc5604
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index c978c39..0b68675 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -1058,6 +1058,28 @@ Reference< XShape > BezierShape::implConvertAndInsert(
const Reference< XShapes
aPropSet.setProperty( PROP_PolyPolygonBezier, aBezierCoords );
}
+// Handle horizontal and vertical flip.
+if (!maTypeModel.maFlip.isEmpty())
+{
+if (SdrObject* pShape = GetSdrObjectFromXShape(xShape))
+{
+if (maTypeModel.maFlip.startsWith("x"))
+{
+Point aCenter(pShape->GetSnapRect().Center());
+Point aPoint2(aCenter);
+aPoint2.setY(aPoint2.getY() + 1);
+pShape->NbcMirror(aCenter, aPoint2);
+}
+if (maTypeModel.maFlip.endsWith("y"))
+{
+Point aCenter(pShape->GetSnapRect().Center());
+Point aPoint2(aCenter);
+aPoint2.setX(aPoint2.getX() + 1);
+pShape->NbcMirror(aCenter, aPoint2);
+}
+}
+}
+
// Hacky way of ensuring the shape is correctly sized/positioned
xShape->setSize( awt::Size( rShapeRect.Width, rShapeRect.Height ) );
xShape->setPosition( awt::Point( rShapeRect.X, rShapeRect.Y ) );
diff --git a/sw/qa/extras/ooxmlimport/data/tdf105127.docx
b/sw/qa/extras/ooxmlimport/data/tdf105127.docx
new file mode 100644
index 000..3cdfa7f
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf105127.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index b1ccafc..0acf8f0 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -692,6 +692,13 @@ DECLARE_OOXMLIMPORT_TEST(testBnc779620, "bnc779620.docx")
lcl_countTextFrames( mxComponent, 1 );
}
+DECLARE_OOXMLIMPORT_TEST(testTdf105127, "tdf105127.docx")
+{
+auto aPolyPolygon =
getProperty(getShape(1), "PolyPolygonBezier");
+// This was 1910, the shape was rendered upside down.
+CPPUNIT_ASSERT_EQUAL(static_cast(3257),
aPolyPolygon.Coordinates[0][0].Y);
+}
+
DECLARE_OOXMLIMPORT_TEST(testfdo76583, "fdo76583.docx")
{
// The problem was that the floating table was imported as a non-floating
one.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Libreoffice service fails in OBS (openSUSE)
2017-01-05 22:11 GMT+01:00 Miklos Vajna :
> Hi,
>
> On Thu, Jan 05, 2017 at 11:11:31AM +0100, Tomáš Chvátal <
> tomas.chva...@gmail.com> wrote:
> > It always reports the same prior the crash, see the attached file.
> > Everytime I trigger it the result is the same.
>
> I meant something like this:
>
> diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
> index 6e95c64..ea451c0 100644
> --- a/postprocess/qa/services.cxx
> +++ b/postprocess/qa/services.cxx
> @@ -260,6 +260,9 @@ void Test::test() {
> == blacklist.end())
> {
> if (i.second.constructors.empty()) {
> +std::cout
> +<< "trying to instantiate implementation \""
> +<< i.first << "\"\n";
> if (i.second.accumulationBased) {
> createInstance(
> i.first, false, i.first, i.second.serviceNames,
> &comps);
>
> I'm afraid your log only contains what is the last service that's not
> instantiated before the crash, but that may be irrelevant.
>
>
Ah now i get it. Well it happens always on the same test:
[ 649s] trying to instantiate implementation
"com.sun.star.wizards.agenda.CallWizard"
[ 649s] unknown:0:(anonymous namespace)::Test::test
[ 649s] uncaught exception of type std::bad_alloc
[ 649s] - std::bad_alloc
Cheers
Tom
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/odbc/OConnection.cxx | 37 +++
1 file changed, 12 insertions(+), 25 deletions(-)
New commits:
commit c2b24cd6fbcc70e279b5c4c742911453dafe02a0
Author: Stephan Bergmann
Date: Fri Jan 6 10:53:34 2017 +0100
Use string literals directly
Change-Id: Ia4ae5c01ae7eb976a0e9638f8bc8fe7ebab8e2cb
diff --git a/connectivity/source/drivers/odbc/OConnection.cxx
b/connectivity/source/drivers/odbc/OConnection.cxx
index 66f3146..9e0b3d1 100644
--- a/connectivity/source/drivers/odbc/OConnection.cxx
+++ b/connectivity/source/drivers/odbc/OConnection.cxx
@@ -191,68 +191,55 @@ SQLRETURN OConnection::Construct(const OUString&
url,const Sequence< PropertyVal
OUString aDSN("DSN="), aUID, aPWD, aSysDrvSettings;
aDSN += url.copy(nLen+1);
-const char* pUser = "user";
-const char* pTimeout= "Timeout";
-const char* pSilent = "Silent";
-const char* pPwd= "password";
-const char* pUseCatalog = "UseCatalog";
-const char* pSysDrv = "SystemDriverSettings";
-const char* pCharSet= "CharSet";
-const char* pParaName = "ParameterNameSubstitution";
-const char* pPrivName = "IgnoreDriverPrivileges";
-const char* pVerColName = "PreventGetVersionColumns"; // #i60273#
-const char* pRetrieving = "IsAutoRetrievingEnabled";
-const char* pRetriStmt = "AutoRetrievingStatement";
-
sal_Int32 nTimeout = 20;
bool bSilent = true;
const PropertyValue *pBegin = info.getConstArray();
const PropertyValue *pEnd = pBegin + info.getLength();
for(;pBegin != pEnd;++pBegin)
{
-if( pBegin->Name.equalsAscii(pTimeout))
+if( pBegin->Name == "Timeout")
OSL_VERIFY( pBegin->Value >>= nTimeout );
-else if( pBegin->Name.equalsAscii(pSilent))
+else if( pBegin->Name == "Silent")
OSL_VERIFY( pBegin->Value >>= bSilent );
-else if( pBegin->Name.equalsAscii(pPrivName))
+else if( pBegin->Name == "IgnoreDriverPrivileges")
OSL_VERIFY( pBegin->Value >>= m_bIgnoreDriverPrivileges );
-else if( pBegin->Name.equalsAscii(pVerColName))
+else if( pBegin->Name == "PreventGetVersionColumns")
OSL_VERIFY( pBegin->Value >>= m_bPreventGetVersionColumns );
-else if( pBegin->Name.equalsAscii(pParaName))
+else if( pBegin->Name == "ParameterNameSubstitution")
OSL_VERIFY( pBegin->Value >>= m_bParameterSubstitution );
-else if( pBegin->Name.equalsAscii(pRetrieving))
+else if( pBegin->Name == "IsAutoRetrievingEnabled")
{
bool bAutoRetrievingEnabled = false;
OSL_VERIFY( pBegin->Value >>= bAutoRetrievingEnabled );
enableAutoRetrievingEnabled(bAutoRetrievingEnabled);
}
-else if( pBegin->Name.equalsAscii(pRetriStmt))
+else if( pBegin->Name == "AutoRetrievingStatement")
{
OUString sGeneratedValueStatement;
OSL_VERIFY( pBegin->Value >>= sGeneratedValueStatement );
setAutoRetrievingStatement(sGeneratedValueStatement);
}
-else if( pBegin->Name.equalsAscii(pUser))
+else if( pBegin->Name == "user")
{
OSL_VERIFY( pBegin->Value >>= aUID );
aDSN = aDSN + ";UID=" + aUID;
}
-else if( pBegin->Name.equalsAscii(pPwd))
+else if( pBegin->Name == "password")
{
OSL_VERIFY( pBegin->Value >>= aPWD );
aDSN = aDSN + ";PWD=" + aPWD;
}
-else if( pBegin->Name.equalsAscii(pUseCatalog))
+else if( pBegin->Name == "UseCatalog")
{
OSL_VERIFY( pBegin->Value >>= m_bUseCatalog );
}
-else if( pBegin->Name.equalsAscii(pSysDrv))
+else if( pBegin->Name == "SystemDriverSettings")
{
OSL_VERIFY( pBegin->Value >>= aSysDrvSettings );
aDSN += ";";
aDSN += aSysDrvSettings;
}
-else if( pBegin->Name.equalsAscii(pCharSet))
+else if( pBegin->Name == "CharSet")
{
OUString sIanaName;
OSL_VERIFY( pBegin->Value >>= sIanaName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - solenv/qa
solenv/qa/python/gbuildtoide.py |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit ed11f8eb344fb70d17a76f15365f181a662bcc98
Author: Christian Lohmaier
Date: Thu Nov 24 11:21:32 2016 +0100
gbuildtoide: builddir is not necessarily same as srcdir
Change-Id: Ied9f9abcc75f2edcd518ac247907f573aa21f35e
Reviewed-on: https://gerrit.libreoffice.org/32405
Reviewed-by: Christian Lohmaier
Tested-by: Jenkins
diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py
index 8ff87ba..7b2a2c4 100644
--- a/solenv/qa/python/gbuildtoide.py
+++ b/solenv/qa/python/gbuildtoide.py
@@ -98,20 +98,23 @@ class CheckGbuildToIdeModules(unittest.TestCase):
self.tempwork = tempfile.mkdtemp()
self.tempsrc = tempfile.mkdtemp()
self.srcdir = os.environ['SRCDIR']
+self.builddir = os.environ['BUILDDIR']
if os.environ['OS'] == 'WNT':
self.tempworkmixed = self.tempwork.replace('\\','/')
self.tempsrcmixed = self.tempsrc.replace('\\','/')
self.srcdirnative = self.srcdir.replace('/','\\')
+self.builddirnative = self.builddir.replace('/','\\')
else:
self.tempworkmixed = self.tempwork
self.tempsrcmixed = self.tempsrc
self.srcdirnative = self.srcdir
-shutil.copyfile(os.path.join(self.srcdirnative, 'config_host.mk'),
os.path.join(self.tempsrc, 'config_host.mk'))
-shutil.copyfile(os.path.join(self.srcdirnative,
'config_host_lang.mk'), os.path.join(self.tempsrc, 'config_host_lang.mk'))
+self.builddirnative = self.builddir
+shutil.copyfile(os.path.join(self.builddirnative, 'config_host.mk'),
os.path.join(self.tempsrc, 'config_host.mk'))
+shutil.copyfile(os.path.join(self.builddirnative,
'config_host_lang.mk'), os.path.join(self.tempsrc, 'config_host_lang.mk'))
+shutil.copytree(os.path.join(self.builddirnative, 'config_host'),
os.path.join(self.tempsrc, 'config_host'))
shutil.copyfile(os.path.join(self.srcdirnative, 'Repository.mk'),
os.path.join(self.tempsrc, 'Repository.mk'))
shutil.copyfile(os.path.join(self.srcdirnative,
'RepositoryExternal.mk'), os.path.join(self.tempsrc, 'RepositoryExternal.mk'))
shutil.copyfile(os.path.join(self.srcdirnative, 'RepositoryFixes.mk'),
os.path.join(self.tempsrc, 'RepositoryFixes.mk'))
-shutil.copytree(os.path.join(self.srcdirnative, 'config_host'),
os.path.join(self.tempsrc, 'config_host'))
print('copytree from _%s_ to _%s_' % (os.path.join(self.srcdirnative,
'solenv').replace('\\', '#').replace('/', '!'), os.path.join(self.tempsrc,
'solenv').replace('\\', '#').replace('/', '!')))
shutil.copytree(os.path.join(self.srcdirnative, 'solenv'),
os.path.join(self.tempsrc, 'solenv'))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/qa
basic/qa/basic_coverage/test_abs_method.vb | 17 ++ basic/qa/basic_coverage/test_array_method.vb | 20 ++ basic/qa/basic_coverage/test_array_methods.vb | 33 --- basic/qa/basic_coverage/test_asc_method.vb | 15 + basic/qa/basic_coverage/test_atn_method.vb | 15 + basic/qa/basic_coverage/test_beep_method.vb | 12 + basic/qa/basic_coverage/test_cbool_method.vb | 16 + basic/qa/basic_coverage/test_cbyte_method.vb | 16 + basic/qa/basic_coverage/test_ccur_method.vb | 16 + basic/qa/basic_coverage/test_cdate_method.vb | 16 + basic/qa/basic_coverage/test_cdatetofromiso_methods.vb | 16 + basic/qa/basic_coverage/test_cdatetounodatecdatefromunodate_methods.vb | 18 ++ basic/qa/basic_coverage/test_cdatetounodatetimecdatefromunodatetime_methods.vb | 18 ++ basic/qa/basic_coverage/test_cdatetounotimecdatefromunotime_methods.vb | 18 ++ basic/qa/basic_coverage/test_cdbl_method.vb | 16 + basic/qa/basic_coverage/test_chdircurdir_methods.vb | 12 + basic/qa/basic_coverage/test_choose_method.vb | 16 + basic/qa/basic_coverage/test_cint_method.vb | 16 + basic/qa/basic_coverage/test_compatibilitymode_method.vb | 15 + basic/qa/basic_coverage/test_conversion_methods.vb | 49 - basic/qa/basic_coverage/test_converttofromurl_methods.vb | 15 + basic/qa/basic_coverage/test_cossin_methods.vb | 15 + basic/qa/basic_coverage/test_createobject_method.vb | 21 ++ basic/qa/basic_coverage/test_createunolistener_method.vb | 13 + basic/qa/basic_coverage/test_createunoservice_method.vb | 13 + basic/qa/basic_coverage/test_createunostruct_method.vb | 13 + basic/qa/basic_coverage/test_createunovalue_method.vb | 15 + basic/qa/basic_coverage/test_csng_method.vb | 16 + basic/qa/basic_coverage/test_cstr_method.vb | 16 + basic/qa/basic_coverage/test_cvar_method.vb | 16 + basic/qa/basic_coverage/test_cverr_method.vb | 16 + basic/qa/basic_coverage/test_datedateadddatediff_methods.vb | 18 ++ basic/qa/basic_coverage/test_datedatepartday_methods.vb | 18 ++ basic/qa/basic_coverage/test_datetime_methods.vb | 64 --- basic/qa/basic_coverage/test_dimarray_method.vb | 18 ++ basic/qa/basic_coverage/test_environ_method.vb | 12 + basic/qa/basic_coverage/test_equalunoobjects_method.vb | 25 ++ basic/qa/basic_coverage/test_erl_method.vb | 22 ++ basic/qa/basic_coverage/test_err_method.vb | 22 ++ basic/qa/basic_coverage/test_falsetrue_method.vb | 16 + basic/qa/basic_coverage/test_fix_method.vb | 15 + basic/qa/basic_coverage/test_frac_method.vb | 15 + basic/qa/basic_coverage/test_freefile_method.vb | 15 + basic/qa/basic_coverage/test_freelibrary_method.vb | 12 + basic/qa/basic_coverage/test_getdefaultcontext_method.vb | 12 + basic/qa/basic_coverage/test_getdialogzoomfactorx_method.vb | 15 + basic/qa/basic_coverage/test_getdialogzoomfactory_method.vb | 15 + basic/qa/basic_coverage/test_getguitype_method.vb | 15 + basic/qa/basic_coverage/test_getguiversion_method.vb | 15 + basic/qa/basic_coverage/test_getpathseparator_method.vb | 15 + basic/qa/basic_coverage/test_getprocessservicemanager_method.vb | 12 + basic/qa/basic_coverage/test_getsolarversion_method.vb | 15 + basic/qa/basic_coverage/test_getsystemticks_method.vb | 15 + basic/qa/basic_coverage/test_getsystemtype_method.vb | 15 + basic/qa/basic_coverage/test_hasunointerfaces_method.vb | 16 + basic/qa/basic_coverage/
[Libreoffice-commits] core.git: writerperfect/qa xmloff/qa
writerperfect/qa/unit/DirectoryStreamTest.cxx |2 +-
writerperfect/qa/unit/WPXSvStreamTest.cxx | 24
xmloff/qa/unit/uxmloff.cxx|6 +++---
3 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit ff8f5e6255ed7b627fb42ecd9ef18293218f
Author: Miklos Vajna
Date: Fri Jan 6 08:33:59 2017 +0100
writerperfect, xmloff: fix loplugin:cppunitassertequals warnings
Change-Id: Ie8246433a7cea0886f00d8c76cf6f7d023545417
Reviewed-on: https://gerrit.libreoffice.org/32770
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/writerperfect/qa/unit/DirectoryStreamTest.cxx
b/writerperfect/qa/unit/DirectoryStreamTest.cxx
index 79646ed..0b347ac 100644
--- a/writerperfect/qa/unit/DirectoryStreamTest.cxx
+++ b/writerperfect/qa/unit/DirectoryStreamTest.cxx
@@ -139,7 +139,7 @@ void lcl_testDataOperations(RVNGInputStream &rStream)
CPPUNIT_ASSERT_EQUAL(-1, rStream.seek(0, librevenge::RVNG_SEEK_CUR));
unsigned long numBytesRead = 0;
-CPPUNIT_ASSERT(nullptr == rStream.read(1, numBytesRead));
+CPPUNIT_ASSERT(!rStream.read(1, numBytesRead));
CPPUNIT_ASSERT_EQUAL(0UL, numBytesRead);
}
diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx
b/writerperfect/qa/unit/WPXSvStreamTest.cxx
index 16d8ebc..70ff441 100644
--- a/writerperfect/qa/unit/WPXSvStreamTest.cxx
+++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx
@@ -197,7 +197,7 @@ void WPXSvStreamTest::testSeekSet()
CPPUNIT_ASSERT(!pInput->isEnd());
CPPUNIT_ASSERT_EQUAL(0, pInput->seek(nLen, RVNG_SEEK_SET));
-CPPUNIT_ASSERT(nLen == pInput->tell());
+CPPUNIT_ASSERT_EQUAL(pInput->tell(), nLen);
CPPUNIT_ASSERT(pInput->isEnd());
// go back to the beginning
@@ -212,7 +212,7 @@ void WPXSvStreamTest::testSeekSet()
CPPUNIT_ASSERT(!pInput->isEnd());
CPPUNIT_ASSERT(0 != pInput->seek(nLen + 1, RVNG_SEEK_SET));
-CPPUNIT_ASSERT(nLen == pInput->tell());
+CPPUNIT_ASSERT_EQUAL(pInput->tell(), nLen);
CPPUNIT_ASSERT(pInput->isEnd());
}
@@ -249,7 +249,7 @@ void WPXSvStreamTest::testSeekCur()
CPPUNIT_ASSERT(!pInput->isEnd());
CPPUNIT_ASSERT(0 != pInput->seek(nLen + 1, RVNG_SEEK_CUR));
-CPPUNIT_ASSERT(nLen == pInput->tell());
+CPPUNIT_ASSERT_EQUAL(pInput->tell(), nLen);
CPPUNIT_ASSERT(pInput->isEnd());
}
@@ -264,11 +264,11 @@ void WPXSvStreamTest::testSeekEnd()
// valid seeks
CPPUNIT_ASSERT_EQUAL(0, pInput->seek(0, RVNG_SEEK_END));
-CPPUNIT_ASSERT(nLen == pInput->tell());
+CPPUNIT_ASSERT_EQUAL(pInput->tell(), nLen);
CPPUNIT_ASSERT(pInput->isEnd());
CPPUNIT_ASSERT_EQUAL(0, pInput->seek(-1, RVNG_SEEK_END));
-CPPUNIT_ASSERT((nLen - 1) == pInput->tell());
+CPPUNIT_ASSERT_EQUAL(pInput->tell(), (nLen - 1));
CPPUNIT_ASSERT(!pInput->isEnd());
CPPUNIT_ASSERT_EQUAL(0, pInput->seek(-nLen, RVNG_SEEK_END));
@@ -281,7 +281,7 @@ void WPXSvStreamTest::testSeekEnd()
// invalid seeks
CPPUNIT_ASSERT(0 != pInput->seek(1, RVNG_SEEK_END));
-CPPUNIT_ASSERT(nLen == pInput->tell());
+CPPUNIT_ASSERT_EQUAL(pInput->tell(), nLen);
CPPUNIT_ASSERT(pInput->isEnd());
CPPUNIT_ASSERT(0 != pInput->seek(-nLen - 1, RVNG_SEEK_END));
@@ -297,7 +297,7 @@ void WPXSvStreamTest::testStructured()
assert(bool(pInput));
CPPUNIT_ASSERT(pInput->isStructured());
-CPPUNIT_ASSERT(2 == pInput->subStreamCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(2),
pInput->subStreamCount());
lcl_testSubStreams(pInput);
// check for existing substream
@@ -318,7 +318,7 @@ void WPXSvStreamTest::testStructured()
assert(bool(pInput));
CPPUNIT_ASSERT(pInput->isStructured());
-CPPUNIT_ASSERT(9 == pInput->subStreamCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(9),
pInput->subStreamCount());
lcl_testSubStreams(pInput);
// check for existing substream
@@ -338,11 +338,11 @@ void WPXSvStreamTest::testStructured()
const shared_ptr pInput(lcl_createStream());
CPPUNIT_ASSERT(!pInput->isStructured());
-CPPUNIT_ASSERT(0 == pInput->subStreamCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(0),
pInput->subStreamCount());
CPPUNIT_ASSERT(!pInput->existsSubStream("foo"));
-CPPUNIT_ASSERT(nullptr == pInput->getSubStreamByName("foo"));
-CPPUNIT_ASSERT(nullptr == pInput->getSubStreamById(42));
-CPPUNIT_ASSERT(nullptr == pInput->subStreamName(42));
+CPPUNIT_ASSERT(!pInput->getSubStreamByName("foo"));
+CPPUNIT_ASSERT(!pInput->getSubStreamById(42));
+CPPUNIT_ASSERT(!pInput->subStreamName(42));
}
}
diff --git a/xmloff/qa/unit/uxmloff.cxx b/xmloff/qa/unit/uxmloff.cxx
index 7fc606e..baae178 100644
--- a/xmloff/qa/unit/uxmloff.cxx
+++ b/xmloff/qa/unit/uxmloff.cxx
@@ -78,13 +78,13 @@ void Test::testAutoStylePool()
// not that interesting but worth checking
bool bHack = (getenv("LIBO_ONEWAY_STAB
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/rtfsdrexport.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 032b5090729a19170856851215a2ea8ea8616e81
Author: Stephan Bergmann
Date: Fri Jan 6 10:30:55 2017 +0100
No need to check isEmpty() before clearing
Change-Id: I75b077cbc2d100964d4157220561d53c1b235199
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx
b/sw/source/filter/ww8/rtfsdrexport.cxx
index 4397dff..d76a1f6 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -60,8 +60,7 @@ void RtfSdrExport::OpenContainer(sal_uInt16 nEscherContainer,
int nRecInstance)
if (nEscherContainer == ESCHER_SpContainer)
{
m_nShapeType = ESCHER_ShpInst_Nil;
-if (!m_aShapeStyle.isEmpty())
-m_aShapeStyle.setLength(0);
+m_aShapeStyle.setLength(0);
m_aShapeStyle.ensureCapacity(200);
m_aShapeProps.clear();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/toolbar/toolbar.js | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 22b676f088b558d3ea79b14863755a931bd7c919
Author: Pranav Kant
Date: Fri Jan 6 14:42:27 2017 +0530
loleaflet: Make id of these toolbar items consistent with others
We assume that id of the toolbar item is lowercase(unocommand),
so lets keep it consistent too for alignment buttons.
This also makes alignment buttons toggle except for spreadsheet
where alignment of cell text happens via a different uno command,
HorizontalAlignment.
Change-Id: Ibacf06bd99435cd24b27c7870173a2519b167af1
Reviewed-on: https://gerrit.libreoffice.org/32774
Reviewed-by: pranavk
Tested-by: pranavk
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 3ef80bd..4263580 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -383,10 +383,10 @@ $(function () {
{type: 'html', id: 'backcolor-html', html: ''},
{type: 'button', id: 'backcolor', img: 'backcolor',
hint: _('Highlighting')},
{type: 'break'},
- {type: 'button', id: 'alignleft', img: 'alignleft',
hint: _('Align left'), uno: 'LeftPara', unosheet: 'HorizontalAlignment
{"HorizontalAlignment":{"type":"unsigned short", "value":"1"}}'},
- {type: 'button', id: 'alignhorizontal', img:
'alignhorizontal', hint: _('Center horizontally'), uno: 'CenterPara', unosheet:
'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short",
"value":"2"}}'},
- {type: 'button', id: 'alignright', img: 'alignright',
hint: _('Align right'), uno: 'RightPara', unosheet: 'HorizontalAlignment
{"HorizontalAlignment":{"type":"unsigned short", "value":"3"}}'},
- {type: 'button', id: 'alignblock', img: 'alignblock',
hint: _('Justified'), uno: 'JustifyPara', unosheet: 'HorizontalAlignment
{"HorizontalAlignment":{"type":"unsigned short", "value":"4"}}'},
+ {type: 'button', id: 'leftpara', img: 'alignleft',
hint: _('Align left'), uno: 'LeftPara', unosheet: 'HorizontalAlignment
{"HorizontalAlignment":{"type":"unsigned short", "value":"1"}}'},
+ {type: 'button', id: 'centerpara', img:
'alignhorizontal', hint: _('Center horizontally'), uno: 'CenterPara', unosheet:
'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short",
"value":"2"}}'},
+ {type: 'button', id: 'rightpara', img: 'alignright',
hint: _('Align right'), uno: 'RightPara', unosheet: 'HorizontalAlignment
{"HorizontalAlignment":{"type":"unsigned short", "value":"3"}}'},
+ {type: 'button', id: 'justifypara', img:
'alignblock', hint: _('Justified'), uno: 'JustifyPara', unosheet:
'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short",
"value":"4"}}'},
{type: 'break', id: 'wraptextseparator'},
{type: 'button', id: 'wraptext', img: 'wraptext',
hint: _('Wrap Text'), uno: 'WrapText'},
{type: 'button', id: 'togglemergecells', img:
'togglemergecells', hint: _('Merge and Center Cells'), uno: 'ToggleMergeCells'},
@@ -606,6 +606,11 @@ function toLocalePattern (pattern, regex, text, sub1,
sub2) {
return text;
}
+function unoCmdToToolbarId(commandname)
+{
+ return commandname.toLowerCase().substr(5);
+}
+
function selectItem(item, func)
{
var index = -1;
@@ -898,6 +903,7 @@ map.on('commandstatechanged', function (e) {
var found = false;
var value, color, div;
var matches;
+
if (commandName === '.uno:AssignLayout') {
$('.styles-select').val(state).trigger('change');
} else if (commandName === '.uno:StyleApply') {
@@ -1041,7 +1047,7 @@ map.on('commandstatechanged', function (e) {
$('#PageStatus').html(state ? state :
' ');
}
- var id = commandName.toLowerCase().substr(5);
+ var id = unoCmdToToolbarId(commandName);
if (typeof formatButtons[id] !== 'undefined') {
if (state === 'true') {
toolbar.enable(id);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9e6132b985b7cb8acebe4fdb2322b25931abde3e Author: Olivier Date: Thu Jan 5 18:56:27 2017 -0200 Updated core Project: help d2ff85a3942838ae72e4d7abced5e94e6d275225 Typos and tweaks in Help pages from translation Change-Id: I53963f69b268ac57166963b5d1f4cac663b67312 Reviewed-on: https://gerrit.libreoffice.org/32760 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/helpcontent2 b/helpcontent2 index 5dab8d0..d2ff85a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5dab8d006d59a1187da8afae151c48f24080764f +Subproject commit d2ff85a3942838ae72e4d7abced5e94e6d275225 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060102.xhp |4 ++-- source/text/scalc/01/func_aggregate.xhp |2 +- source/text/swriter/classificationbar.xhp |6 +++--- source/text/swriter/guide/protection.xhp |2 +- 4 files changed, 7 insertions(+), 7 deletions(-) New commits: commit d2ff85a3942838ae72e4d7abced5e94e6d275225 Author: Olivier Date: Thu Jan 5 18:56:27 2017 -0200 Typos and tweaks in Help pages from translation Change-Id: I53963f69b268ac57166963b5d1f4cac663b67312 Reviewed-on: https://gerrit.libreoffice.org/32760 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/source/text/scalc/01/04060102.xhp b/source/text/scalc/01/04060102.xhp index 62550e7..e99aa7b 100644 --- a/source/text/scalc/01/04060102.xhp +++ b/source/text/scalc/01/04060102.xhp @@ -165,11 +165,11 @@ - + - + diff --git a/source/text/scalc/01/func_aggregate.xhp b/source/text/scalc/01/func_aggregate.xhp index c934650..5f77dae 100644 --- a/source/text/scalc/01/func_aggregate.xhp +++ b/source/text/scalc/01/func_aggregate.xhp @@ -281,7 +281,7 @@ Array â obligatory argument. The array can be specified by the boundaries of the range, the name of the named range or the column label. For using column labels âAutomatically find columns and rows labelsâ function needs to be enabled. k â obligatory argument for the following functions: LARGE, SMALL, PERCENTILE.INC, QUARTILE.INC, PERCENTILE.EXC, QUARTILE.EXC. It is a numeric argument, which must correspond to the second argument of these functions. -If the k argument is necessary, but not specified, the function returns the error Err:511.If the Function and/or Option arguments specified not correctly, the function returns the error Err:502. +If the k argument is necessary, but not specified, the function returns the error Err:511.If the Function and/or Option arguments are not specified correctly, the function returns the error Err:502. Examples diff --git a/source/text/swriter/classificationbar.xhp b/source/text/swriter/classificationbar.xhp index 82e929b..9f8fddf 100644 --- a/source/text/swriter/classificationbar.xhp +++ b/source/text/swriter/classificationbar.xhp @@ -89,7 +89,7 @@ classification levels;customizing -%PRODUCTNAME allows customization of the levels of classification for your business. To customize the number and the name of the levels, copy the file example.xml located in Tools -> Options -> LibreOffice -> Paths -> Classification into a local folder and edit the contents. +%PRODUCTNAME allows customization of the levels of classification for your business. To customize the number and the name of the levels, copy the file example.xml located in Tools - Options - LibreOffice - Paths - Classification into a local folder and edit the contents. Use the file with your %PRODUCTNAME locale in the name as example. Save the file and make the classification path above access the file. Your system administrator can place the file in a network folder and make all users access the classification settings file. @@ -109,10 +109,10 @@ The Classification bar contains tools to help secure document handling. -The Classification toolbar contains listboxes to help in selecting the security of the document, according to the BAF category policy and BAILS levels. %PRODUCTNAME will add custom fields in the document properties (File -> Properties, Custom fields tab) to store the classification policy as document metadata. +The Classification toolbar contains listboxes to help in selecting the security of the document, according to the BAF category policy and BAILS levels. %PRODUCTNAME will add custom fields in the document properties (File - Properties, Custom fields tab) to store the classification policy as document metadata. -Go to menu View -> Toolbars and select Classification +Go to menu View - Toolbars and select Classification diff --git a/source/text/swriter/guide/protection.xhp b/source/text/swriter/guide/protection.xhp index 7c49682..8c28d5b 100644 --- a/source/text/swriter/guide/protection.xhp +++ b/source/text/swriter/guide/protection.xhp @@ -98,7 +98,7 @@ Protection of the whole %PRODUCTNAME Writer document from changes. -You can protect the contents of %PRODUCTNAME Writer document from changes, if it is one form follow file formats: .doc, .docx, .odt, .ott. +You can protect the contents of %PRODUCTNAME Writer document from changes, if it is one of the following file formats: .doc, .docx, .odt, .ott. This protection is not intended to be a secure protection. It is just a switch to protect the contents against accidental changes in the document. To enable the protection of the whole document, go to Tools - Options... - Writer - Compatibility and choose Protect form. To disable the protection of the whole document, go to Tools - Options... - Writer - Compatibility and uncheck Protect for
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 11913e7f3d9ee9e90e6131f67584bb60f67aa577 Author: Thorsten Behrens Date: Fri Jan 6 02:47:23 2017 +0100 libpng: update to release 1.6.28 Change-Id: Ie22e5eb6656ef1d2e7903011ea72a1aa26d4da7c Reviewed-on: https://gerrit.libreoffice.org/32768 Tested-by: Jenkins Reviewed-by: Thorsten Behrens Reviewed-on: https://gerrit.libreoffice.org/32769 Reviewed-by: Andras Timar diff --git a/download.lst b/download.lst index 700c4dd..3662491 100644 --- a/download.lst +++ b/download.lst @@ -125,8 +125,8 @@ export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary- export PAGEMAKER_MD5SUM := 5c4985a68be0b79d3f809da5e12b143c export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 -export PNG_MD5SUM := 65213080dd30a9b16193d9b83adc1ee9 -export PNG_TARBALL := libpng-1.6.24.tar.gz +export PNG_MD5SUM := 897ccec1ebfb0922e83c2bfaa1be8748 +export PNG_TARBALL := libpng-1.6.28.tar.gz export POPPLER_MD5SUM := 38c758d84437378ec4f5aae9f875301d export POPPLER_TARBALL := poppler-0.46.0.tar.bz2 export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/source
forms/source/xforms/model_ui.cxx |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit 1f56cb61e2b991d2e9c7a639ec3b2f2994f93888 Author: Stephan Bergmann Date: Fri Jan 6 10:01:05 2017 +0100 This apparently doesn't happen The code has been like this ever since ed8c4fd992a4e2e43e65d05e6f06336bfe2fdba2 "INTEGRATION: CWS eforms2", but it doesn't make sense: It apparently wants to clear XCurrent to leave the for-loop early, but would acutally cause a null deref instead. So this branch apparently doesn't get executed routinely. Is it impossible to be reached? To play it safe, assume no. But I can't find anything substantiating the "we'll remove the slash below" claim, so just return an empty string instead. Change-Id: I18e05385bbef05e7682a2eb4d525cfee25d9a6f5 diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index 80442cc..fa4be64 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -241,11 +241,7 @@ OUString Model::getDefaultBindingExpressionForNode( default: // unknown type? fail! OSL_FAIL( "unknown node type!" ); -xCurrent.set( nullptr ); -aBuffer.setLength(0); -// we'll remove the slash below -aBuffer.insert( 0, '/' ); -break; +return OUString(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: libreofficekit/source
libreofficekit/source/gtk/lokdocview.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit de6e3d1e87d0e620bcef115605404a76800600a9 Author: Pranav Kant Date: Fri Jan 6 14:33:36 2017 +0530 lokdocview: Handle insert key Change-Id: Idb5ad17a3a94b9a6fba1113a759207c59acfb7bd diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index cb88bb1..0721080 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -749,6 +749,9 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent) case GDK_KEY_Page_Up: nKeyCode = com::sun::star::awt::Key::PAGEUP; break; +case GDK_KEY_Insert: +nKeyCode = com::sun::star::awt::Key::INSERT; +break; case GDK_KEY_Shift_L: case GDK_KEY_Shift_R: if (pEvent->type == GDK_KEY_PRESS) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/baside2b.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 1426eb8a9a8cc150f2330135f28384e5193c6c2b
Author: Stephan Bergmann
Date: Fri Jan 6 09:38:06 2017 +0100
Clean up a usage of OUStringBuffer
Change-Id: I05205763502fb20e056cc80f50a37b93232e5743
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 0468e12..035d9b0 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2620,7 +2620,7 @@ TextView* CodeCompleteListBox::GetParentEditView()
void CodeCompleteListBox::InsertSelectedEntry()
{
-if( !aFuncBuffer.toString().isEmpty() )
+if( !aFuncBuffer.isEmpty() )
{
// if the user typed in something: remove, and insert
GetParentEditView()->SetSelection(
pCodeCompleteWindow->pParent->GetLastHighlightPortionTextSelection() );
@@ -2725,7 +2725,7 @@ void CodeCompleteListBox::KeyInput( const KeyEvent&
rKeyEvt )
HideAndRestoreFocus();
break;
case KEY_BACKSPACE: case KEY_DELETE:
-if( !aFuncBuffer.toString().isEmpty() )
+if( !aFuncBuffer.isEmpty() )
{
//if there was something inserted by tab: add it to
aFuncBuffer
TextSelection aSel( GetParentEditView()->GetSelection() );
@@ -2736,10 +2736,9 @@ void CodeCompleteListBox::KeyInput( const KeyEvent&
rKeyEvt )
if( !aTabInsertedStr.isEmpty() && aTabInsertedStr !=
aFuncBuffer.toString() )
{
-aFuncBuffer.setLength(0);
-aFuncBuffer = aFuncBuffer.append(aTabInsertedStr);
+aFuncBuffer = aTabInsertedStr;
}
-aFuncBuffer =
aFuncBuffer.remove(aFuncBuffer.getLength()-1, 1);
+aFuncBuffer.remove(aFuncBuffer.getLength()-1, 1);
SetMatchingEntries();
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/source
forms/source/xforms/model_ui.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d289b56c655dae12a26316f40473c46377e18a44
Author: Stephan Bergmann
Date: Fri Jan 6 09:37:00 2017 +0100
Use OUString::boolean
Change-Id: I8989fcc18cd0f0b28ef6da5c3c3d7f87429b569b
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index 50cdf82..80442cc 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -857,7 +857,7 @@ static OUString lcl_serializeForDisplay( const
Reference& xResult
switch( xResult->getObjectType() )
{
case XPathObjectType_XPATH_BOOLEAN:
-return xResult->getBoolean() ? OUString("true") : OUString("false");
+return OUString::boolean(xResult->getBoolean());
case XPathObjectType_XPATH_STRING:
return "\"" + xResult->getString() + "\"";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/source
forms/source/xforms/model_ui.cxx | 21 +
1 file changed, 5 insertions(+), 16 deletions(-)
New commits:
commit 28180c40a6ad3e500156fa660fdf7ec810049629
Author: Stephan Bergmann
Date: Fri Jan 6 09:34:45 2017 +0100
No need for an OUStringBuffer here
Change-Id: I01697ac2b84f836ff0b3d15aa8d03042f229eacb
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index 5b75be5..50cdf82 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -853,29 +853,20 @@ static OUString lcl_serializeForDisplay( const
Reference& xResult
if( ! xResult.is() )
return getResource( RID_STR_XFORMS_CANT_EVALUATE );
-
// TODO: localize
-OUStringBuffer aBuffer;
-
switch( xResult->getObjectType() )
{
case XPathObjectType_XPATH_BOOLEAN:
-aBuffer.append( xResult->getBoolean()
-? OUString("true")
-: OUString("false") );
-break;
+return xResult->getBoolean() ? OUString("true") : OUString("false");
case XPathObjectType_XPATH_STRING:
-aBuffer.append("\"" + xResult->getString() + "\"");
-break;
+return "\"" + xResult->getString() + "\"";
case XPathObjectType_XPATH_NODESET:
-aBuffer.append( lcl_serializeForDisplay( xResult->getNodeList() ) );
-break;
+return lcl_serializeForDisplay( xResult->getNodeList() );
case XPathObjectType_XPATH_NUMBER:
-aBuffer.append( xResult->getDouble() );
-break;
+return OUString::number(xResult->getDouble());
case XPathObjectType_XPATH_UNDEFINED:
case XPathObjectType_XPATH_POINT:
@@ -885,10 +876,8 @@ static OUString lcl_serializeForDisplay( const
Reference& xResult
case XPathObjectType_XPATH_XSLT_TREE:
default:
// TODO: localized error message?
-break;
+return OUString();
}
-
-return aBuffer.makeStringAndClear();
}
OUString Model::getResultForExpression(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
