[Libreoffice-commits] core.git: vcl/android vcl/headless vcl/inc vcl/ios vcl/osx vcl/source vcl/unx vcl/win
vcl/android/androidinst.cxx |6 -
vcl/headless/svpframe.cxx| 10 +-
vcl/headless/svpinst.cxx |4
vcl/inc/android/androidinst.hxx |4
vcl/inc/headless/svpframe.hxx|4
vcl/inc/headless/svpinst.hxx |4
vcl/inc/ios/iosinst.hxx |4
vcl/inc/osx/salframe.h |4
vcl/inc/osx/salinst.h|4
vcl/inc/salframe.hxx | 61 +++--
vcl/inc/salinst.hxx |5 -
vcl/inc/unx/gtk/gtkframe.hxx | 26 ++---
vcl/inc/unx/gtk/gtkinst.hxx |4
vcl/inc/unx/salframe.h | 20 ++--
vcl/inc/unx/salinst.h|4
vcl/inc/win/salframe.h |2
vcl/inc/win/salinst.h|6 -
vcl/ios/iosinst.cxx |4
vcl/osx/salframe.cxx | 22 ++--
vcl/osx/salframeview.mm | 22 ++--
vcl/osx/salinst.cxx |4
vcl/osx/vclnsapp.mm |2
vcl/source/window/window.cxx | 32 +++
vcl/unx/generic/app/salinst.cxx |4
vcl/unx/generic/app/wmadaptor.cxx| 12 +-
vcl/unx/generic/window/salframe.cxx | 158 +--
vcl/unx/gtk/app/gtkinst.cxx |4
vcl/unx/gtk/window/gtksalframe.cxx | 86 +--
vcl/unx/kde/salnativewidgets-kde.cxx |2
vcl/unx/kde4/KDESalFrame.cxx |2
vcl/win/source/app/salinst.cxx | 10 +-
vcl/win/source/window/salframe.cxx | 52 +--
32 files changed, 298 insertions(+), 290 deletions(-)
New commits:
commit 0e30af6fdc496ee1b935d68e979aa63729cef878
Author: Noel Grandin
Date: Fri Oct 2 11:37:49 2015 +0200
convert SAL_FRAME_STYLE to scoped enum
Change-Id: Ic3f7fddcea36c18ffe43c4c633d415f596a58cbc
Reviewed-on: https://gerrit.libreoffice.org/19094
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index ce46fee..787beba 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -118,7 +118,7 @@ class AndroidSalFrame : public SvpSalFrame
public:
AndroidSalFrame( AndroidSalInstance *pInstance,
SalFrame *pParent,
- sal_uLong nSalFrameStyle,
+ SalFrameStyleFlags nSalFrameStyle,
SystemParentData *pSysParent )
: SvpSalFrame( pInstance, pParent, nSalFrameStyle,
true, basebmp::Format::ThirtyTwoBitTcMaskRGBA,
@@ -177,12 +177,12 @@ public:
}
};
-SalFrame *AndroidSalInstance::CreateChildFrame( SystemParentData* pParent,
sal_uLong nStyle )
+SalFrame *AndroidSalInstance::CreateChildFrame( SystemParentData* pParent,
SalFrameStyleFlags nStyle )
{
return new AndroidSalFrame( this, NULL, nStyle, pParent );
}
-SalFrame *AndroidSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nStyle
)
+SalFrame *AndroidSalInstance::CreateFrame( SalFrame* pParent,
SalFrameStyleFlags nStyle )
{
return new AndroidSalFrame( this, pParent, nStyle, NULL );
}
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 4d4a225..408e05d 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -69,7 +69,7 @@ void SvpSalFrame::enableDamageTracker( bool bOn )
SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
SalFrame* pParent,
- sal_uLong nSalFrameStyle,
+ SalFrameStyleFlags nSalFrameStyle,
bool bTopDown,
basebmp::Format nScanlineFormat,
SystemParentData* ) :
@@ -137,9 +137,9 @@ SvpSalFrame::~SvpSalFrame()
SvpSalFrame* pFrame =
const_cast(static_cast(*it));
if( pFrame->m_bVisible&&
pFrame->m_pParent == NULL &&
-(pFrame->m_nStyle & (SAL_FRAME_STYLE_MOVEABLE |
- SAL_FRAME_STYLE_SIZEABLE |
- SAL_FRAME_STYLE_CLOSEABLE) ) != 0
+(pFrame->m_nStyle & (SalFrameStyleFlags::MOVEABLE |
+ SalFrameStyleFlags::SIZEABLE |
+ SalFrameStyleFlags::CLOSEABLE) )
)
{
pFrame->GetFocus();
@@ -155,7 +155,7 @@ void SvpSalFrame::GetFocus()
if( s_pFocusFrame == this )
return;
-if( (m_nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION |
SAL_FRAME_STYLE_FLOAT)) == 0 )
+if( (m_nStyle & (SalFrameStyleFlags::OWNERDRAWDECORATION |
SalFrameStyleFlags::FLOAT)) == SalFrameStyleFlags::NONE )
{
if( s_pFocusFrame )
s_pFocusFrame->LoseFocus();
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index bcecfac.
[Libreoffice-commits] core.git: icon-themes/sifr
icon-themes/sifr/framework/res/folder_32.png |binary icon-themes/sifr/framework/res/templates_32.png|binary icon-themes/sifr/res/lx03253.png |binary icon-themes/sifr/res/lx03254.png |binary icon-themes/sifr/res/lx03255.png |binary icon-themes/sifr/res/odb_32_8.png |binary icon-themes/sifr/res/odf_32_8.png |binary icon-themes/sifr/res/odg_32_8.png |binary icon-themes/sifr/res/odm_32_8.png |binary icon-themes/sifr/res/odp_32_8.png |binary icon-themes/sifr/res/ods_32_8.png |binary icon-themes/sifr/res/odt_32_8.png |binary icon-themes/sifr/res/sx03253.png |binary icon-themes/sifr/res/sx03254.png |binary icon-themes/sifr/res/sx03255.png |binary icon-themes/sifr/svx/res/doc_modified_feedback.png |binary icon-themes/sifr/svx/res/selection_10x22.png |binary 17 files changed New commits: commit 5ffa83a2b39cc77b36ef6f2ecc46ae5482e3e68c Author: Matthias Freund Date: Sun Oct 4 22:07:56 2015 +0200 tdf#75256 sifr icons for the startcenter part 1 I'm adding 32px version of the startcenter icons. Have to do the recentfiles icon later. Change-Id: I4794a9900dd6b74f27853648768667456bc0a862 Reviewed-on: https://gerrit.libreoffice.org/19135 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/icon-themes/sifr/framework/res/folder_32.png b/icon-themes/sifr/framework/res/folder_32.png new file mode 100644 index 000..e229761 Binary files /dev/null and b/icon-themes/sifr/framework/res/folder_32.png differ diff --git a/icon-themes/sifr/framework/res/templates_32.png b/icon-themes/sifr/framework/res/templates_32.png new file mode 100644 index 000..8b17e88 Binary files /dev/null and b/icon-themes/sifr/framework/res/templates_32.png differ diff --git a/icon-themes/sifr/res/lx03253.png b/icon-themes/sifr/res/lx03253.png new file mode 100644 index 000..1bf9ccb Binary files /dev/null and b/icon-themes/sifr/res/lx03253.png differ diff --git a/icon-themes/sifr/res/lx03254.png b/icon-themes/sifr/res/lx03254.png new file mode 100644 index 000..1424260 Binary files /dev/null and b/icon-themes/sifr/res/lx03254.png differ diff --git a/icon-themes/sifr/res/lx03255.png b/icon-themes/sifr/res/lx03255.png new file mode 100644 index 000..b42516c Binary files /dev/null and b/icon-themes/sifr/res/lx03255.png differ diff --git a/icon-themes/sifr/res/odb_32_8.png b/icon-themes/sifr/res/odb_32_8.png new file mode 100644 index 000..5353be9 Binary files /dev/null and b/icon-themes/sifr/res/odb_32_8.png differ diff --git a/icon-themes/sifr/res/odf_32_8.png b/icon-themes/sifr/res/odf_32_8.png new file mode 100644 index 000..4fe0b4a Binary files /dev/null and b/icon-themes/sifr/res/odf_32_8.png differ diff --git a/icon-themes/sifr/res/odg_32_8.png b/icon-themes/sifr/res/odg_32_8.png new file mode 100644 index 000..e8c607a Binary files /dev/null and b/icon-themes/sifr/res/odg_32_8.png differ diff --git a/icon-themes/sifr/res/odm_32_8.png b/icon-themes/sifr/res/odm_32_8.png new file mode 100644 index 000..18fec9c Binary files /dev/null and b/icon-themes/sifr/res/odm_32_8.png differ diff --git a/icon-themes/sifr/res/odp_32_8.png b/icon-themes/sifr/res/odp_32_8.png new file mode 100644 index 000..0fe23cd Binary files /dev/null and b/icon-themes/sifr/res/odp_32_8.png differ diff --git a/icon-themes/sifr/res/ods_32_8.png b/icon-themes/sifr/res/ods_32_8.png new file mode 100644 index 000..e60ee61 Binary files /dev/null and b/icon-themes/sifr/res/ods_32_8.png differ diff --git a/icon-themes/sifr/res/odt_32_8.png b/icon-themes/sifr/res/odt_32_8.png new file mode 100644 index 000..7f8433a Binary files /dev/null and b/icon-themes/sifr/res/odt_32_8.png differ diff --git a/icon-themes/sifr/res/sx03253.png b/icon-themes/sifr/res/sx03253.png new file mode 100644 index 000..7a69cf5 Binary files /dev/null and b/icon-themes/sifr/res/sx03253.png differ diff --git a/icon-themes/sifr/res/sx03254.png b/icon-themes/sifr/res/sx03254.png new file mode 100644 index 000..38038e1 Binary files /dev/null and b/icon-themes/sifr/res/sx03254.png differ diff --git a/icon-themes/sifr/res/sx03255.png b/icon-themes/sifr/res/sx03255.png new file mode 100644 index 000..966300e Binary files /dev/null and b/icon-themes/sifr/res/sx03255.png differ diff --git a/icon-themes/sifr/svx/res/doc_modified_feedback.png b/icon-themes/sifr/svx/res/doc_modified_feedback.png new file mode 100644 index 000..c48f694 Binary files /dev/null and b/icon-themes/sifr/svx/res/doc_modified_feedback.png differ diff --git a/icon-themes/sifr/svx/res/selection_10x22.png b/icon-themes/sifr/svx/res/selection_10x22.png new file mode 100644 index 000..c4ddcfe Binary files /dev/null and b/icon-themes/sifr/svx/res/selection_10x22.png differ __
[Libreoffice-commits] core.git: starmath/source
starmath/source/parse.cxx | 20 +---
1 file changed, 5 insertions(+), 15 deletions(-)
New commits:
commit 57c1b07d24c40ec1e1912d06c3dc2c5d5fefd268
Author: Takeshi Abe
Date: Mon Oct 5 10:41:51 2015 +0900
starmath: Simply add elements to the end of the vector
No logic changed.
Change-Id: I5df80d6c31f1c103c49ac4310a7d06da57d1a05f
Reviewed-on: https://gerrit.libreoffice.org/19142
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index e3306de..02b1236 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1018,26 +1018,21 @@ void SmParser::DoAlign()
void SmParser::DoLine()
{
-sal_uInt16 n = 0;
SmNodeArray ExpressionArray;
-ExpressionArray.resize(n);
-
// start with single expression that may have an alignment statement
// (and go on with expressions that must not have alignment
// statements in 'while' loop below. See also 'Expression()'.)
if (m_aCurToken.eType != TEND && m_aCurToken.eType != TNEWLINE)
{
DoAlign();
-ExpressionArray.resize(++n);
-ExpressionArray[n - 1] = popOrZero(m_aNodeStack);
+ExpressionArray.push_back(popOrZero(m_aNodeStack));
}
while (m_aCurToken.eType != TEND && m_aCurToken.eType != TNEWLINE)
{
DoExpression();
-ExpressionArray.resize(++n);
-ExpressionArray[n - 1] = popOrZero(m_aNodeStack);
+ExpressionArray.push_back(popOrZero(m_aNodeStack));
}
//If there's no expression, add an empty one.
@@ -1067,23 +1062,18 @@ void SmParser::DoExpression()
m_aNodeStack.push_front(pNode.release()); // push the node from
above again (now to be used as argument to this current 'nospace' node)
}
-sal_uInt16 n = 0;
SmNodeArray RelationArray;
-RelationArray.resize(n);
-
DoRelation();
-RelationArray.resize(++n);
-RelationArray[n - 1] = popOrZero(m_aNodeStack);
+RelationArray.push_back(popOrZero(m_aNodeStack));
while (m_aCurToken.nLevel >= 4)
{
DoRelation();
-RelationArray.resize(++n);
-RelationArray[n - 1] = popOrZero(m_aNodeStack);
+RelationArray.push_back(popOrZero(m_aNodeStack));
}
-if (n > 1)
+if (RelationArray.size() > 1)
{
SmExpressionNode *pSNode = new SmExpressionNode(m_aCurToken);
pSNode->SetSubNodes(RelationArray);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 93243] replace boost::bind with C++11 lambdas
https://bugs.documentfoundation.org/show_bug.cgi?id=93243 --- Comment #7 from Commit Notification --- Albert Thuswaldner committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=7d82dfca4d78841930a4411371c3d211badeccdb tdf#93243 replace boost::bind with C++11 lambdas in excimp8.cxx It will be available in 5.1.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/excimp8.cxx | 13 ++---
sc/source/filter/inc/excimp8.hxx |6 ++
2 files changed, 8 insertions(+), 11 deletions(-)
New commits:
commit 7d82dfca4d78841930a4411371c3d211badeccdb
Author: Albert Thuswaldner
Date: Sun Oct 4 11:43:44 2015 +0200
tdf#93243 replace boost::bind with C++11 lambdas in excimp8.cxx
Change-Id: I810b524ce59703ca298e3c171f590c5dd75396de
Reviewed-on: https://gerrit.libreoffice.org/19122
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/filter/excel/excimp8.cxx
b/sc/source/filter/excel/excimp8.cxx
index eba2d5c..e1ecf4b 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -846,7 +846,7 @@ void XclImpAutoFilterData::EnableRemoveFilter()
void XclImpAutoFilterBuffer::Insert( RootData* pRoot, const ScRange& rRange)
{
if( !GetByTab( rRange.aStart.Tab() ) )
-maFilters.push_back( new XclImpAutoFilterData( pRoot, rRange) );
+maFilters.push_back( XclImpAutoFilterSharePtr(new
XclImpAutoFilterData( pRoot, rRange) ));
}
void XclImpAutoFilterBuffer::AddAdvancedRange( const ScRange& rRange )
@@ -865,17 +865,16 @@ void XclImpAutoFilterBuffer::AddExtractPos( const
ScRange& rRange )
void XclImpAutoFilterBuffer::Apply()
{
-std::for_each(maFilters.begin(),maFilters.end(),
-boost::bind(&XclImpAutoFilterData::Apply,_1));
+for( const auto& rFilterPtr : maFilters )
+rFilterPtr->Apply();
}
XclImpAutoFilterData* XclImpAutoFilterBuffer::GetByTab( SCTAB nTab )
{
-boost::ptr_vector::iterator it;
-for( it = maFilters.begin(); it != maFilters.end(); ++it )
+for( const auto& rFilterPtr : maFilters )
{
-if( it->Tab() == nTab )
-return &(*it);
+if( rFilterPtr->Tab() == nTab )
+return rFilterPtr.get();
}
return NULL;
}
diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx
index e50cfd4..2ce1135 100644
--- a/sc/source/filter/inc/excimp8.hxx
+++ b/sc/source/filter/inc/excimp8.hxx
@@ -22,8 +22,6 @@
#include
-#include
-
#include "imp_op.hxx"
#include "root.hxx"
#include "excscen.hxx"
@@ -123,8 +121,8 @@ public:
XclImpAutoFilterData* GetByTab( SCTAB nTab );
private:
-
-boost::ptr_vector maFilters;
+typedef std::shared_ptr XclImpAutoFilterSharePtr;
+std::vector maFilters;
};
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/dialog.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a983d1a0b8a60b336e02e018b703b9a0727f2b33
Author: Takeshi Abe
Date: Sun Oct 4 12:24:39 2015 +0900
starmath: Kill c-style cast
Change-Id: I6f65c2518b25fbe3a08070e81c33ce346ffb0801
Reviewed-on: https://gerrit.libreoffice.org/19117
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 8ada350..f8cf2e0 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -214,7 +214,7 @@ bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet)
else
nPrintSize = PRINT_SIZE_ZOOMED;
-rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTSIZE), (sal_uInt16) nPrintSize));
+rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTSIZE), nPrintSize));
rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTZOOM), (sal_uInt16)
m_pZoom->GetValue()));
rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTITLE), m_pTitle->IsChecked()));
rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTEXT), m_pText->IsChecked()));
@@ -228,7 +228,7 @@ bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet)
void SmPrintOptionsTabPage::Reset(const SfxItemSet* rSet)
{
-SmPrintSize ePrintSize = (SmPrintSize)static_cast(rSet->Get(GetWhich(SID_PRINTSIZE))).GetValue();
+SmPrintSize ePrintSize = static_cast(static_cast(rSet->Get(GetWhich(SID_PRINTSIZE))).GetValue());
m_pSizeNormal->Check(ePrintSize == PRINT_SIZE_NORMAL);
m_pSizeScaled->Check(ePrintSize == PRINT_SIZE_SCALED);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/mathmlimport.cxx |9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) New commits: commit f811037c55f1fe41b2411958ace8c1b04c68ea14 Author: Takeshi Abe Date: Sun Oct 4 12:14:49 2015 +0900 starmath: Avoid unnecessary cast Change-Id: I18abd676b81c714e21ad83acbe4a4163fd5830fb Reviewed-on: https://gerrit.libreoffice.org/19116 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 19a3890..51b729b 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -674,8 +674,7 @@ void SmXMLContext_Helper::ApplyAttrs() aToken.eType = TBOLD; else aToken.eType = TNBOLD; -SmStructureNode *pFontNode = static_cast -(new SmFontNode(aToken)); +SmFontNode *pFontNode = new SmFontNode(aToken); pFontNode->SetSubNodes(0,popOrZero(rNodeStack)); rNodeStack.push_front(pFontNode); } @@ -685,8 +684,7 @@ void SmXMLContext_Helper::ApplyAttrs() aToken.eType = TITALIC; else aToken.eType = TNITALIC; -SmStructureNode *pFontNode = static_cast -(new SmFontNode(aToken)); +SmFontNode *pFontNode = new SmFontNode(aToken); pFontNode->SetSubNodes(0,popOrZero(rNodeStack)); rNodeStack.push_front(pFontNode); } @@ -935,8 +933,7 @@ void SmXMLPhantomContext_Impl::EndElement() aToken.nLevel = 5; aToken.eType = TPHANTOM; -SmStructureNode *pPhantom = static_cast -(new SmFontNode(aToken)); +SmFontNode *pPhantom = new SmFontNode(aToken); SmNodeStack &rNodeStack = GetSmImport().GetNodeStack(); pPhantom->SetSubNodes(0,popOrZero(rNodeStack)); rNodeStack.push_front(pPhantom); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - shell/qa
shell/qa/zip/makefile.mk | 31 +++
shell/qa/zip/ziptest.cxx | 45 -
2 files changed, 27 insertions(+), 49 deletions(-)
New commits:
commit 0f6e2406f9263b9d99d9648c1f5d033b0d042fe0
Author: Damjan Jovanovic
Date: Mon Oct 5 04:20:14 2015 +
#i125003# migrate main/shell tests from cppunit to Google Test
diff --git a/shell/qa/zip/makefile.mk b/shell/qa/zip/makefile.mk
index f1a0cee..fe3396c 100644
--- a/shell/qa/zip/makefile.mk
+++ b/shell/qa/zip/makefile.mk
@@ -30,32 +30,23 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
-
-@all:
-.IF "$(GUI)" == "OS2"
-@echo "Skipping, cppunit broken."
-.ELIF "$(WITH_CPPUNIT)" != "YES"
-@echo "cppunit disabled. nothing do do."
-.END
-
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+@echo unit tests are disabled. Nothing to do.
+
.ELSE
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-SHL1OBJS = $(SLOFILES)
-SHL1RPATH = NONE
-SHL1STDLIBS = $(SALLIB) $(CPPUNITLIB)
-SHL1LIBS = $(SLB)$/..$/lib$/iqa_zipimpl.lib
-SHL1TARGET = $(TARGET)
-SHL1VERSIONMAP = $(PRJ)/qa/zip/export.map
-DEF1NAME=$(SHL1TARGET)
-SLOFILES=$(SLO)$/ziptest.obj
+APP1OBJS = $(SLO)$/ziptest.obj
+APP1RPATH = NONE
+APP1STDLIBS = $(SALLIB) $(GTESTLIB)
+APP1LIBS = $(SLB)$/..$/lib$/iqa_zipimpl.lib
+APP1TARGET = $(TARGET)
+APP1TEST = enabled
-.ENDIF
# --- Targets --
.INCLUDE : target.mk
-.INCLUDE: _cppunit.mk
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
diff --git a/shell/qa/zip/ziptest.cxx b/shell/qa/zip/ziptest.cxx
index 5342675..75a4a8b 100644
--- a/shell/qa/zip/ziptest.cxx
+++ b/shell/qa/zip/ziptest.cxx
@@ -23,65 +23,52 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
+#include "gtest/gtest.h"
#include
#include "testimpl/testzipimpl.hxx"
using namespace std;
-class Test : public CppUnit::TestFixture
+class Test : public ::testing::Test
{
-private:
+protected:
string documentName;
public:
Test();
-void setUp() {}
-void tearDown() {}
-void test_directory();
-void test_hasContentCaseInSensitive();
-void test_getContent();
-CPPUNIT_TEST_SUITE(Test);
-CPPUNIT_TEST(test_directory);
-CPPUNIT_TEST(test_hasContentCaseInSensitive);
-CPPUNIT_TEST(test_getContent);
-CPPUNIT_TEST_SUITE_END();
+void SetUp() {}
+void TearDown() {}
};
-CPPUNIT_TEST_SUITE_REGISTRATION(Test);
-
Test::Test() :
documentName("simpledocument.odt")
{
}
//
-void Test::test_directory()
+TEST_F(Test, test_directory)
{
TestZipImpl testImpl(documentName.c_str());
bool isPassed = testImpl.test_directory();
-CPPUNIT_ASSERT_MESSAGE("Content does not match with expected directory
names.", isPassed);
+ASSERT_TRUE(isPassed) << "Content does not match with expected
directory names.";
}
//
-void Test::test_hasContentCaseInSensitive()
+TEST_F(Test, test_hasContentCaseInSensitive)
{
TestZipImpl testImpl(documentName.c_str());
bool isPassed = testImpl.test_hasContentCaseInSensitive();
-CPPUNIT_ASSERT_MESSAGE("Content in zip file was not found.", isPassed);
+ASSERT_TRUE(isPassed) << "Content in zip file was not found.";
}
//
-void Test::test_getContent()
+TEST_F(Test, test_getContent)
{
TestZipImpl testImpl(documentName.c_str());
bool isPassed = testImpl.test_getContent();
-CPPUNIT_ASSERT_MESSAGE("Couldn't receive content buffer form
zipfile.", isPassed);
+ASSERT_TRUE(isPassed) << "Couldn't receive content buffer form
zipfile.";
}
-//#
-// register test suites
-
-CPPUNIT_PLUGIN_IMPLEMENT();
-
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(&argc, argv);
+return RUN_ALL_TESTS();
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac icon-themes/README
configure.ac |2 +- icon-themes/README | 26 -- 2 files changed, 1 insertion(+), 27 deletions(-) New commits: commit c9c61e0faab31c753f60361a2909c1e61481ac89 Author: Bjoern Michaelsen Date: Mon Oct 5 01:20:10 2015 +0200 add elementary theme, remove outdated stuff from icon-themes/README Change-Id: Id4c0c1910a785f2cc836113fffdfbe3b7ef40f2f diff --git a/configure.ac b/configure.ac index e650e71..c199248 100644 --- a/configure.ac +++ b/configure.ac @@ -11441,7 +11441,7 @@ WITH_THEMES="" if test "x$with_theme" != "xno"; then for theme in $with_theme; do case $theme in - breeze|crystal|galaxy|hicontrast|human|industrial|oxygen|sifr|tango|tango_testing) real_theme="$theme" ;; + breeze|crystal|elementary|galaxy|hicontrast|human|industrial|oxygen|sifr|tango|tango_testing) real_theme="$theme" ;; default) real_theme=galaxy ;; *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;; esac diff --git a/icon-themes/README b/icon-themes/README index b18813a..72cc618 100644 --- a/icon-themes/README +++ b/icon-themes/README @@ -31,32 +31,6 @@ How to add a new image set: - Add its name (new_set) to WITH_THEMES variable in configure.ac -- Add a vcl constant for it in vcl/inc/vcl/settings.hxx, e.g. - #define STYLE_SYMBOLS_NEW_SET ((ULONG)5) - -- Map the vcl constant to its real name in -::rtl::OUString StyleSettings::ImplSymbolsStyleToName( sal_uLong nStyle ) const - and -sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const - both in vcl/source/app/settings.cxx, e.g. -case STYLE_SYMBOLS_NEW_SET: return ::rtl::OUString( "new_set" ); - and -else if ( rName == "new_set" ) - return STYLE_SYMBOLS_NEW_SET; - -- Add localized item names to 'ListBox LB_ICONSTYLE' to -'StringList [ de ]' - and 'StringList [ en-US ]', e.g. -< "New set" ; > ; - both in cui/source/options/optgdlg.src - -- Add the new_set to 'SymbolsStyle' property - in officecfg/registry/schema/org/openoffice/Office/Common.xcs. - -- The default theme for various desktops (KDE, GNOME, ...) is defined in -ULONG StyleSettings::GetCurrentSymbolsStyle() const in - vcl/source/app/settings.cxx - - The fallback for particular icons is defined be packimages_CUSTOM_FALLBACK_1 in packimages/CustomTarget_images.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Should we make it harder to assign a bug to yourself?
Hi, On Sun, Oct 04, 2015 at 10:33:45PM +0200, Thorsten Behrens wrote: > I don't know, looks more like a social problem to me - and I think we > were faring rather well in the past with being permissive and keeping > red tape low (and checking things afterwards). yes, agreeing here -- esp. since the self-assign might add some commitment and prevent a "silent withdrawal" at least in a few cases. > So perhaps we might want to include the below query to the ESC stats > stack, and try keeping the oldest entry newer than, say, 3-6 months: > > https://bugs.documentfoundation.org/buglist.cgi?email1=libreoffice-bugs%40lists.freedesktop.org&emailassigned_to1=1&emailtype1=notsubstring&list_id=561999&order=changeddate%2Cpriority%2Cbug_severity&query_based_on=&query_format=advanced&resolution=---&status_whiteboard=easyhack&status_whiteboard_type=allwordssubstr Yes, that should be a gardening task just like e.g. tdf#84480[1]. Also adding a "last changed" column and sorting by it might be helpful: https://bugs.documentfoundation.org/buglist.cgi?columnlist=changeddate%2Ccomponent%2Cshort_short_desc%2Cpriority%2Cbug_severity%2Clongdescs.count%2Cbug_status&email1=libreoffice-bugs%40lists.freedesktop.org&emailassigned_to1=1&emailtype1=notsubstring&list_id=562010&order=changeddate%2Cpriority%2Cbug_severity&query_based_on=&query_format=advanced&resolution=---&status_whiteboard=easyhack&status_whiteboard_type=allwordssubstr shows tdf#39632 is an assigned EasyHack that wasnt touched since 2013-10-05 (aka 2 years) Best, Bjoern [1] That one seems by the look at the mabnothighest and highestnotmab queries in need of some serious grooming too. At least as long as: https://wiki.documentfoundation.org/QA/Most_Annoying_Bugs https://wiki.documentfoundation.org/Special:WhatLinksHere/QA/Most_Annoying_Bugs are still around. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Calc] Bad rendering performance of "selected copy" snake/circulation animation
Sylvain R wrote: > Any comments? > Disabling 'Use anti-aliasing' in Tools->Options->(generic) View should use the fast path you described, without the need to modify the code. HTH, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/macosx/Info.plist.in | 24 1 file changed, 24 insertions(+) New commits: commit 0c60fae0adf77cd5b95cd8aa69aa89a3fe265ab0 Author: Andras Timar Date: Sun Oct 4 22:46:14 2015 +0200 Info.plist: add Chart documents Change-Id: I1c29b640735e0f62eb8fbc59970f446a14784002 diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in index 15f4beb..537edf9 100755 --- a/sysui/desktop/macosx/Info.plist.in +++ b/sysui/desktop/macosx/Info.plist.in @@ -320,6 +320,30 @@ oasis-drawing.icns + + +UTTypeIdentifier +org.oasis-open.opendocument.chart +UTTypeDescription +OpenDocument Chart +UTTypeConformsTo + +public.data +public.content + +UTTypeTagSpecification + +public.filename-extension + +odc + +public.mime-type + +application/vnd.oasis.opendocument.chart + + + + UTTypeIdentifier ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/macosx/Info.plist.in | 54 + 1 file changed, 54 insertions(+) New commits: commit 9a65f22079cdc583c7327e2d2e8ec1a1324cf621 Author: Andras Timar Date: Sun Oct 4 22:41:09 2015 +0200 Info.plist: add UTTypeIconFile keys Change-Id: Iaa091521ea246fd2ccd403c5db9bce5dad67756d diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in index 7adf661..15f4beb 100755 --- a/sysui/desktop/macosx/Info.plist.in +++ b/sysui/desktop/macosx/Info.plist.in @@ -46,6 +46,8 @@ application/vnd.sun.xml.writer +UTTypeIconFile +text.icns UTTypeIdentifier @@ -68,6 +70,8 @@ application/vnd.oasis.opendocument.text +UTTypeIconFile +oasis-text.icns UTTypeIdentifier @@ -90,6 +94,8 @@ application/vnd.oasis.opendocument.text-flat-xml +UTTypeIconFile +oasis-text.icns @@ -114,6 +120,8 @@ application/vnd.sun.xml.calc +UTTypeIconFile +spreadsheet.icns UTTypeIdentifier @@ -136,6 +144,8 @@ application/vnd.oasis.opendocument.spreadsheet +UTTypeIconFile +oasis-spreadsheet.icns UTTypeIdentifier @@ -158,6 +168,8 @@ application/vnd.oasis.opendocument.spreadsheet-flat-xml +UTTypeIconFile +oasis-spreadsheet.icns @@ -182,6 +194,8 @@ application/vnd.sun.xml.impress +UTTypeIconFile +presentation.icns UTTypeIdentifier @@ -204,6 +218,8 @@ application/vnd.oasis.opendocument.presentation +UTTypeIconFile +oasis-presentation.icns UTTypeIdentifier @@ -226,6 +242,8 @@ application/vnd.oasis.opendocument.presentation-flat-xml +UTTypeIconFile +oasis-presentation.icns @@ -250,6 +268,8 @@ application/vnd.sun.xml.draw +UTTypeIconFile +drawing.icns UTTypeIdentifier @@ -272,6 +292,8 @@ application/vnd.oasis.opendocument.graphics +UTTypeIconFile +oasis-drawing.icns UTTypeIdentifier @@ -294,6 +316,8 @@ application/vnd.oasis.opendocument.graphics-flat-xml +UTTypeIconFile +oasis-drawing.icns @@ -318,6 +342,8 @@ application/vnd.sun.xml.writer.global +UTTypeIconFile +master-document.icns UTTypeIdentifier @@ -340,6 +366,8 @@ application/vnd.oasis.opendocument.text-master +UTTypeIconFile +oasis-master-document.icns @@ -364,6 +392,8 @@ application/vnd.sun.xml.math +UTTypeIconFile +formula.icns UTTypeIdentifier @@ -386,6 +416,8 @@ application/vnd.oasis.opendocument.formula +UTTypeIconFile +oasis-formula.icns @@ -410,6 +442,8 @@ application/vnd.sun.xml.writer.template +UTTypeIconFile +text-template.icns UTTypeIdentifier @@ -432,6 +466,8 @@ application/vnd.oasis.opendocument.text-template +UTTypeIconFile +oasis-text-template.icns @@ -456,6 +492,8 @@ application/vnd.oasis.opendocument.text-master-template +UTTypeIconFile +oasis-master-document-template.icns @@ -480,6 +518,8 @@ application/vnd.sun.xml.calc.template +UTTypeIconFile +spreadsheet-template.icns UTTypeIdentifier @@ -502,6 +542,8 @@ application/vnd.oasis.opendocument.spreadsheet-template +
Re: Should we make it harder to assign a bug to yourself?
Andrzej Hunt wrote: > On 04/10/15 09:36, Tor Lillqvist wrote: > > Should we make it harder to assign a bug to yourself? > > FWIW Mozilla already block bug assignment privileges for new accounts - it > doesn't seem like this has caused them any huge problems, so I think copying > their approach would probably be a good idea. > Hi guys, I don't know, looks more like a social problem to me - and I think we were faring rather well in the past with being permissive and keeping red tape low (and checking things afterwards). So perhaps we might want to include the below query to the ESC stats stack, and try keeping the oldest entry newer than, say, 3-6 months: https://bugs.documentfoundation.org/buglist.cgi?email1=libreoffice-bugs%40lists.freedesktop.org&emailassigned_to1=1&emailtype1=notsubstring&list_id=561999&order=changeddate%2Cpriority%2Cbug_severity&query_based_on=&query_format=advanced&resolution=---&status_whiteboard=easyhack&status_whiteboard_type=allwordssubstr That also gives the opportunity to interact. My 2 cents, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Report from llvms static analysis tool
I just built the LO core with scan-build, a static analysis tool. I posted the results to my github page. The report can be viewed at http://danlrobertson.github.io/scan.html. With coverity scan etc I'm not sure if this will provide any new info, but if you're interested, please feel free to check it out. If you have any comments, suggestions, or tips, please feel free to shoot me an email and let me know if this is helpful or not. I don't mind continuing to post the results from my builds if it helps. There will be a lot of false positives, but "given enough eyeballs all bugs are shallow". And don't judge me for how terrible and cheesy my github page is :-) #NotAWebDev #NoArtisticSkillz Best, Daniel signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/macosx/Info.plist.in |2 ++ 1 file changed, 2 insertions(+) New commits: commit 9743bf01cdead5db8a39f0d631eb07512a6662dc Author: Andras Timar Date: Sun Oct 4 22:08:10 2015 +0200 Info.plist: add CFBundleVersion Change-Id: Ib4a13e7b0e1a4ff528563c7a883c3dbbac864bf6 diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in index 294d252..7adf661 100755 --- a/sysui/desktop/macosx/Info.plist.in +++ b/sysui/desktop/macosx/Info.plist.in @@ -1517,6 +1517,8 @@ main.icns CFBundleShortVersionString @MACOSX_BUNDLE_SHORTVERSION@ +CFBundleVersion +@MACOSX_BUNDLE_SHORTVERSION@ CFBundleIdentifier @MACOSX_BUNDLE_IDENTIFIER@ CFBundleInfoDictionaryVersion ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/macosx/Info.plist.in | 24 1 file changed, 24 deletions(-) New commits: commit dddc893807e30d26ccd031ffcf3bada42b5d43af Author: Andras Timar Date: Sun Oct 4 21:41:44 2015 +0200 Info.plist: binary StarOffice formats are not supported Change-Id: I339c4c92121e29cdd39eb598d21ec2fca93300db Reviewed-on: https://gerrit.libreoffice.org/19134 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in index e8209bd..294d252 100755 --- a/sysui/desktop/macosx/Info.plist.in +++ b/sysui/desktop/macosx/Info.plist.in @@ -40,12 +40,10 @@ public.filename-extension sxw -sdw public.mime-type application/vnd.sun.xml.writer -application/vnd.stardivision.writer @@ -110,12 +108,10 @@ public.filename-extension sxc -sdc public.mime-type application/vnd.sun.xml.calc -application/vnd.stardivision.calc @@ -180,14 +176,10 @@ public.filename-extension sxi -sdd -sdp public.mime-type application/vnd.sun.xml.impress -application/vnd.stardivision.impress - application/vnd.stardivision.impress-packed @@ -252,12 +244,10 @@ public.filename-extension sxd -sda public.mime-type application/vnd.sun.xml.draw -application/vnd.stardivision.draw @@ -368,12 +358,10 @@ public.filename-extension sxm -smf public.mime-type application/vnd.sun.xml.math -application/vnd.stardivision.math @@ -967,12 +955,10 @@ CFBundleTypeExtensions sxw -sdw CFBundleTypeMIMETypes application/vnd.sun.xml.writer -application/vnd.stardivision.writer CFBundleTypeIconFile text.icns @@ -1005,12 +991,10 @@ CFBundleTypeExtensions sxc -sdc CFBundleTypeMIMETypes application/vnd.sun.xml.calc -application/vnd.stardivision.calc CFBundleTypeIconFile spreadsheet.icns @@ -1043,14 +1027,10 @@ CFBundleTypeExtensions sxi -sdd -sdp CFBundleTypeMIMETypes application/vnd.sun.xml.impress -application/vnd.stardivision.impress -application/vnd.stardivision.impress-packed CFBundleTypeIconFile presentation.icns @@ -1083,12 +1063,10 @@ CFBundleTypeExtensions sxd -sda CFBundleTypeMIMETypes application/vnd.sun.xml.draw -application/vnd.stardivision.draw CFBundleTypeIconFile drawing.icns @@ -1157,12 +1135,10 @@ CFBundleTypeExtensions sxm -smf CFBundleTypeMIMETypes application/vnd.sun.xml.math -application/vnd.stardivision.math CFBundleTypeIconFile formula.icns ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/xmlsource/xmlsourcedlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 849877871ac0e6032336f759cb39bf9a4a978d44 Author: Julien Nabet Date: Sun Oct 4 20:12:48 2015 +0200 Prefer getSelectedFiles to getFiles (sc) Change-Id: I78e5c590b99113d01545c8f83f6024226aa185c8 Reviewed-on: https://gerrit.libreoffice.org/19133 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index e5e8379..45b75c8 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -201,7 +201,7 @@ void ScXMLSourceDlg::SelectSourceFile() // File picker dialog cancelled. return; -uno::Sequence aFiles = xFilePicker->getFiles(); +uno::Sequence aFiles = xFilePicker->getSelectedFiles(); if (!aFiles.getLength()) return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Feyza license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svtools/source
svtools/source/control/filectrl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 199f3bce1d5cf6067b5edd60f4909e880fb72f5e
Author: Julien Nabet
Date: Sun Oct 4 18:11:14 2015 +0200
Prefer getSelectedFiles to getFiles (svtools)
Change-Id: I6a61f3a04a8e01c2f0a6a0da8cb989e71c120c9b
Reviewed-on: https://gerrit.libreoffice.org/19128
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/svtools/source/control/filectrl.cxx
b/svtools/source/control/filectrl.cxx
index 34941ec..0a64a2d 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -235,7 +235,7 @@ void FileControl::ImplBrowseFile( )
if ( xFilePicker->execute() )
{
-Sequence < OUString > aPathSeq = xFilePicker->getFiles();
+Sequence < OUString > aPathSeq = xFilePicker->getSelectedFiles();
if ( aPathSeq.getLength() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sdext/source
sdext/source/pdfimport/test/export.map| 30 -
sdext/source/pdfimport/test/makefile.mk | 84 ++---
sdext/source/pdfimport/test/tests.cxx | 301 +++---
sdext/source/pdfimport/tree/style.cxx |2
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |5
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |3
6 files changed, 170 insertions(+), 255 deletions(-)
New commits:
commit e2ba80c36d3b953935fe802e05778cfafc8b05f0
Author: Damjan Jovanovic
Date: Sun Oct 4 17:13:47 2015 +
Get --with-pdfimport to compile and link, given the API breaking
changes made in poppler's commits 664865a2ddca9c20ac36a41aef52ebf12eab838d
and c0affb1845c339f89ca67608cb9fd9134ff902f5 in 2011. Also ports unit tests
from cppunit to Google Test, but they all fail due to UNO bootstrapping
errors.
diff --git a/sdext/source/pdfimport/test/export.map
b/sdext/source/pdfimport/test/export.map
deleted file mode 100644
index f12a8b2..000
--- a/sdext/source/pdfimport/test/export.map
+++ /dev/null
@@ -1,30 +0,0 @@
-#**
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**
-
-
-
-UDK_3_0_0 {
-global:
-registerAllTestFunction;
-
-local:
-*;
-};
diff --git a/sdext/source/pdfimport/test/makefile.mk
b/sdext/source/pdfimport/test/makefile.mk
index 7808976..c18591b 100644
--- a/sdext/source/pdfimport/test/makefile.mk
+++ b/sdext/source/pdfimport/test/makefile.mk
@@ -31,6 +31,12 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE: settings.mk
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+@echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
# --- test lib --
.IF "$(ENABLE_PDFIMPORT)" == "NO"
@@ -38,16 +44,14 @@ ENABLE_EXCEPTIONS=TRUE
@echo "PDF Import extension disabled."
.ENDIF
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
.IF "$(SYSTEM_ZLIB)" == "YES"
CFLAGS+=-DSYSTEM_ZLIB
.ENDIF
-SHL1OBJS= \
+APP1OBJS= \
$(SLO)$/tests.obj
-SHL1LIBS=\
+APP1LIBS=\
$(SLB)$/pdfmisc.lib \
$(SLB)$/pdfparse.lib \
$(SLB)$/pdfsax.lib \
@@ -56,33 +60,33 @@ SHL1LIBS=\
$(SLB)$/xpdfwrapper.lib \
$(SLB)$/pdfimport.lib
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=\
+APP1TARGET=$(TARGET)
+APP1STDLIBS=\
$(BASEGFXLIB) \
$(UNOTOOLSLIB) \
$(CANVASTOOLSLIB) \
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
-$(CPPUNITLIB) \
+$(GTESTLIB)\
$(TESTSHL2LIB) \
$(ZLIB3RDLIB) \
$(CPPULIB) \
$(SALLIB)
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME=$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
+APP1RPATH = NONE
+# Run explicitly below:
+APP1TEST = disabled
# --- pdf2xml binary --
TARGET2=pdf2xml
-APP1TARGET=$(TARGET2)
-APP1LIBSALCPPRT=
-APP1OBJS=$(SLO)$/pdf2xml.obj
+APP2TARGET=$(TARGET2)
+APP2LIBSALCPPRT=
+APP2OBJS=$(SLO)$/pdf2xml.obj
-APP1LIBS=\
+APP2LIBS=\
$(SLB)$/pdfmisc.lib \
$(SLB)$/pdfparse.lib \
$(SLB)$/pdfsax.lib \
@@ -91,13 +95,13 @@ APP1LIBS=\
$(SLB)$/xpdfwrapper.lib \
$(SLB)$/pdfimport.lib
-APP1STDLIBS=\
+APP2STDLIBS=\
$(BASEGFXLIB) \
$(UNOTOOLSLIB) \
$(CANVASTOOLSLIB) \
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
-$(CPPUNITLIB) \
+$(GTESTLIB)\
$(TESTSHL2LIB) \
$(ZLIB3RDLIB) \
$(CPPULIB) \
@@ -107,11 +111,11 @@ APP1STDLIBS=\
TARGET3=pdfunzip
-APP2TARGET=$(TARGET3)
-APP2LIBSALCPPRT=
-APP2OBJS=$(SLO)$/pdfunzip.obj
+APP3TARGET=$(TARGET3)
+APP3LIBSALCPPRT=
+APP3OBJS=$(SLO)$/pdfunzip.obj
-APP2LIBS=\
+APP3LIBS=\
$(SLB)$/pdfmisc.lib \
$(SLB)$/pdfparse.lib \
$(SLB)$/pdfsax.lib \
@@ -120,13 +124,13 @@ APP2LIBS=\
$(SLB)$/xpdfwrapper.lib \
$(SLB)$/pdfimport.lib
-APP2STDLIBS=\
+APP3STDLIBS=\
$(BASEGFXLIB) \
$(UNOTOOLSLIB) \
$(CANVASTOOLSLIB)\
$(C
libreoffice@lists.freedesktop.org
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65108] Clean-up header includes (global/local)
https://bugs.documentfoundation.org/show_bug.cgi?id=65108 Feyza changed: What|Removed |Added CC||feyzaaya...@gmail.com Assignee|libreoffice-b...@lists.free |feyzaaya...@gmail.com |desktop.org | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/insdlg.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e4c58c39590091cd9bbc7ace4ebd81b3241a3816
Author: Julien Nabet
Date: Sun Oct 4 16:35:53 2015 +0200
Prefer getSelectedFiles to getFiles (cui)
Change-Id: I4fa2d2700fac9b1a25dfc5c6cbe4ae911c5b3d32
Reviewed-on: https://gerrit.libreoffice.org/19127
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 8e5bc95..d3d34d7 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -127,7 +127,7 @@ IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, BrowseHdl, Button*,
void)
if( xFilePicker->execute() == ExecutableDialogResults::OK )
{
-Sequence< OUString > aPathSeq( xFilePicker->getFiles() );
+Sequence< OUString > aPathSeq( xFilePicker->getSelectedFiles() );
INetURLObject aObj( aPathSeq[0] );
m_pEdFilepath->SetText( aObj.PathToFileName() );
}
@@ -382,7 +382,7 @@ IMPL_LINK_NOARG_TYPED(SvInsertPlugInDialog, BrowseHdl,
Button*, void)
if( xFilePicker->execute() == ExecutableDialogResults::OK )
{
-Sequence< OUString > aPathSeq( xFilePicker->getFiles() );
+Sequence< OUString > aPathSeq( xFilePicker->getSelectedFiles() );
INetURLObject aObj( aPathSeq[0] );
m_pEdFileurl->SetText(aObj.PathToFileName());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/objdsc qadevOOo/tests sdext/source
qadevOOo/objdsc/fps/com.sun.star.comp.ui.dialogs.FilePicker.csv |1 +
qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java|6 +++---
sdext/source/minimizer/fileopendialog.cxx |2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 3ad8f409d7658d94871aff2e709f013e8c869d98
Author: Julien Nabet
Date: Sun Oct 4 16:14:31 2015 +0200
Prefer getSelectedFiles to getFiles (sdext+qadevOOo)
Change-Id: I4827e47b7d67b0112c0f9023c0db4ce8975f06e1
Reviewed-on: https://gerrit.libreoffice.org/19126
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/qadevOOo/objdsc/fps/com.sun.star.comp.ui.dialogs.FilePicker.csv
b/qadevOOo/objdsc/fps/com.sun.star.comp.ui.dialogs.FilePicker.csv
index 40eec70..dae1067 100644
--- a/qadevOOo/objdsc/fps/com.sun.star.comp.ui.dialogs.FilePicker.csv
+++ b/qadevOOo/objdsc/fps/com.sun.star.comp.ui.dialogs.FilePicker.csv
@@ -3,6 +3,7 @@
"FilePicker";"com::sun::star::ui::dialogs::XFilePicker";"setDisplayDirectory()"
"FilePicker";"com::sun::star::ui::dialogs::XFilePicker";"getDisplayDirectory()"
"FilePicker";"com::sun::star::ui::dialogs::XFilePicker";"getFiles()"
+"FilePicker";"com::sun::star::ui::dialogs::XFilePicker2";"getSelectedFiles()"
"FilePicker";"com::sun::star::ui::dialogs::XFilePickerControlAccess#optional";"setValue()"
"FilePicker";"com::sun::star::ui::dialogs::XFilePickerControlAccess#optional";"getValue()"
"FilePicker";"com::sun::star::ui::dialogs::XFilePickerControlAccess#optional";"setLabel()"
diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java
b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java
index afc5ad8..3a2a71e 100644
--- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java
+++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java
@@ -20,7 +20,7 @@ package ifc.ui.dialogs;
import lib.MultiMethodTest;
-import com.sun.star.ui.dialogs.XFilePicker;
+import com.sun.star.ui.dialogs.XFilePicker2;
/**
* Testing com.sun.star.ui.XFilePicker
@@ -41,7 +41,7 @@ import com.sun.star.ui.dialogs.XFilePicker;
*/
public class _XFilePicker extends MultiMethodTest {
-public XFilePicker oObj = null;
+public XFilePicker2 oObj = null;
private String dir = null ;
private static final String fname = "space-metal.jpg" ;
@@ -133,7 +133,7 @@ public class _XFilePicker extends MultiMethodTest {
requiredMethod("setDisplayDirectory()");
requiredMethod("setDefaultName()");
-String[] files = oObj.getFiles();
+String[] files = oObj.getSelectedFiles();
if (files.length > 0) {
log.println("Path get : '" + files[0] + "'") ;
diff --git a/sdext/source/minimizer/fileopendialog.cxx
b/sdext/source/minimizer/fileopendialog.cxx
index ad2e890..c327ea5 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -165,7 +165,7 @@ void FileOpenDialog::setDefaultName( const OUString&
rDefaultName )
}
OUString FileOpenDialog::getURL() const
{
-Sequence< OUString > aFileSeq( mxFilePicker->getFiles() );
+Sequence< OUString > aFileSeq( mxFilePicker->getSelectedFiles() );
return aFileSeq.getLength() ? aFileSeq[ 0 ] : OUString();
};
OUString FileOpenDialog::getFilterName() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - comphelper/GoogleTest_comphelper_string.mk comphelper/GoogleTest_comphelper_weakbag.mk comphelper/Module_comphelper.mk comphelper/qa
comphelper/GoogleTest_comphelper_string.mk | 51 +++
comphelper/GoogleTest_comphelper_weakbag.mk | 50 ++
comphelper/Module_comphelper.mk |7 +++
comphelper/qa/makefile.mk | 52
comphelper/qa/test_string.cxx | 42 ++
comphelper/qa/test_weakbag.cxx | 50 +-
comphelper/qa/version.map | 30
7 files changed, 153 insertions(+), 129 deletions(-)
New commits:
commit 9cbc61419ad4ef0883a543a2111dae28e25a5214
Author: Damjan Jovanovic
Date: Sun Oct 4 13:46:56 2015 +
#i125003# migrate main/comphelper from cppunit to Google Test, fix the
broken string test,
and run the tests on every build.
diff --git a/comphelper/qa/version.map
b/comphelper/GoogleTest_comphelper_string.mk
similarity index 59%
rename from comphelper/qa/version.map
rename to comphelper/GoogleTest_comphelper_string.mk
index f12a8b2..39f170d 100644
--- a/comphelper/qa/version.map
+++ b/comphelper/GoogleTest_comphelper_string.mk
@@ -1,5 +1,5 @@
#**
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,24 +7,45 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
#http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**
-UDK_3_0_0 {
-global:
-registerAllTestFunction;
+$(eval $(call gb_GoogleTest_GoogleTest,comphelper_string))
-local:
-*;
-};
+$(eval $(call gb_GoogleTest_add_exception_objects,comphelper_string, \
+ comphelper/qa/test_string \
+))
+
+$(eval $(call gb_GoogleTest_add_linked_libs,comphelper_string, \
+comphelper \
+cppuhelper \
+cppu \
+sal \
+stl \
+$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_GoogleTest_set_include,comphelper_string,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/formula/inc \
+ -I$(SRCDIR)/comphelper/inc/pch \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_GoogleTest_set_ldflags,comphelper_string,\
+$$(LDFLAGS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/comphelper/qa/makefile.mk
b/comphelper/GoogleTest_comphelper_weakbag.mk
similarity index 61%
rename from comphelper/qa/makefile.mk
rename to comphelper/GoogleTest_comphelper_weakbag.mk
index ac7ce9d..bb936b6 100644
--- a/comphelper/qa/makefile.mk
+++ b/comphelper/GoogleTest_comphelper_weakbag.mk
@@ -21,32 +21,30 @@
-PRJ := ..
-PRJNAME := comphelper
-TARGET := qa
-
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-DLLPRE = # no leading "lib" on .so files
-
-INCPRE += $(MISC)$/$(TARGET)$/inc
-
-SHL1TARGET = $(TARGET)_weakbag
-SHL1OBJS = $(SLO)$/test_weakbag.obj
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB)
$(SALLIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE: target.mk
-
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-$(TESTSHL2) $(SHL1TARGETN)
+$(eval $(call gb_GoogleTest_GoogleTest,comphelper_weakbag))
+
+$(eval $(call gb_GoogleTest_add_exception_objects,comphelper_weakbag, \
+ comphelper/qa/test_weakbag \
+))
+
+$(eval $(call gb_GoogleTest_add_linked_libs,comphelper_weakbag, \
+cppuhelper \
+cppu \
+sal \
+stl \
+$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_GoogleTest_set_include,comphelper_weakbag,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/formula/inc \
+ -I$(SRCDIR)/comphelper/inc/pch \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_GoogleTest_set_ldflags,comphelper_weakbag,\
+$$(LDFLAGS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/comphelper/Module_comphelper.mk b/comphelper/Module_comphelper.mk
index 3e192e53..4bee63b 100644
--- a/comphelper/Module_comphelper.mk
+++ b/comphelper/Module_comphelper.mk
@@ -28,6 +28,13 @@ $(eval $(call gb_Module_add_targets,comphelper,\
Library_comphelp \
))
+ifeq ($(ENABLE_UNIT_TESTS),YES)
+$(eval $(call gb_Module_add_check_targets,comphelper,\
+GoogleTest_comphelper_string \
+GoogleTest_comphelper_weakbag \
+))
+endif
+
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,comphelper,\
Re: Should we make it harder to assign a bug to yourself?
On 04/10/15 09:36, Tor Lillqvist wrote: I have recently noticed a rush of what looks like newbies assigning bugs to themselves. (Those bugs that have their status changes sent to this list.) Doesn't experience show that in a large number of cases, this is wishful thinking, and once they realise how hard it is, many of them will just drop it and forget to assign back, so the bug stays assigned even if nobody actually is working on it? That then might prevent somebody else (who might me more skilled/motivated/lucky) from working on it. > > Should we make it harder to assign a bug to yourself? FWIW Mozilla already block bug assignment privileges for new accounts - it doesn't seem like this has caused them any huge problems, so I think copying their approach would probably be a good idea. New Mozilla contributors are still able to ask to have a bug assigned to them via the bug's comments, and usually this is only done after at least a preliminary patch has been submitted. To request bug editing (and assignment) permissions requires you to have submitted at least 2 patches, or to have found 3 bugs requiring editing [1] - triaging permissions can be requested without any such requirements though. This won't completely eliminate the problem (I'm guessing some people might give up after they've already uploaded a first, potentially broken, patch) - but it could help reduce the number of abandoned bugs somewhat. Cheers, Andrzej [1] https://bugzilla.mozilla.org/page.cgi?id=get_permissions.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/menus/startcenter.desktop | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 990efa00ce0b305500df4bdd6641c2016fa4fa5a
Author: Adolfo Jayme Barrientos
Date: Sun Oct 4 08:37:45 2015 -0500
Change Unity Quicklist to use applicationsâ names
Since weâre still not having translations here, paliate that
at least a little bit by not having strings that require
translations in the fist place.
Change-Id: I93b4f0780bc009587cd55fa6588e16b0d4df7942
diff --git a/sysui/desktop/menus/startcenter.desktop
b/sysui/desktop/menus/startcenter.desktop
index 08d4a11..ed333b6 100644
--- a/sysui/desktop/menus/startcenter.desktop
+++ b/sysui/desktop/menus/startcenter.desktop
@@ -36,27 +36,27 @@ X-KDE-Protocols=file,http,ftp,webdav
Actions=Writer;Calc;Impress;Draw;Base;Math;
[Desktop Action Writer]
-Name=Text Document
+Name=Writer
Exec=${UNIXBASISROOTNAME} --writer
[Desktop Action Calc]
-Name=Spreadsheet
+Name=Calc
Exec=${UNIXBASISROOTNAME} --calc
[Desktop Action Impress]
-Name=Presentation
+Name=Impress
Exec=${UNIXBASISROOTNAME} --impress
[Desktop Action Draw]
-Name=Drawing
+Name=Draw
Exec=${UNIXBASISROOTNAME} --draw
[Desktop Action Base]
-Name=Database
+Name=Base
Exec=${UNIXBASISROOTNAME} --base
[Desktop Action Math]
-Name=Formula
+Name=Math
Exec=${UNIXBASISROOTNAME} --math
##End of actions menu
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/c70c4d203340999fc039838cc487d3e4c28d2f79/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - fpicker/source
fpicker/source/office/RemoteFilesDialog.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 08312042a0ffb680049f20bbc2de9554e1ef09ae
Author: Szymon KÅos
Date: Sun Oct 4 13:20:42 2015 +0200
Remember password after setting new service
Change-Id: I14ba319307f74b24fa474e742504b70c46539a08
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index 7ee410e..0761888 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -697,8 +697,10 @@ void RemoteFilesDialog::SavePassword( const OUString&
rURL, const OUString& rUse
try
{
-if( m_xMasterPasswd->isPersistentStoringAllowed() &&
-( !bPersistent || m_xMasterPasswd->authorizateWithMasterPassword(
Reference< XInteractionHandler>() ) ) )
+if( !bPersistent ||
+( m_xMasterPasswd->isPersistentStoringAllowed()
+&& m_xMasterPasswd->authorizateWithMasterPassword( Reference<
XInteractionHandler>() ) )
+)
{
Reference< XInteractionHandler > xInteractionHandler(
InteractionHandler::createWithParent( m_xContext, 0 ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/shells/drwbassh.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 68c10e2c9db529cc9586579ed735a0823d0a3567
Author: kripton
Date: Sun Oct 4 00:05:46 2015 +0300
Replaced "n" prefix for bool variables with "b".
Change-Id: I3189e3fb8ccfb6a883945a4d637dc9330e41103c
Reviewed-on: https://gerrit.libreoffice.org/19113
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sw/source/uibase/shells/drwbassh.cxx
b/sw/source/uibase/shells/drwbassh.cxx
index 196d1af..51707f6 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -598,12 +598,12 @@ IMPL_LINK_TYPED( SwDrawBaseShell, CheckGroupShapeNameHdl,
AbstractSvxObjectNameD
const OUString sCurrentName = pObj->GetName();
OUString sNewName;
rNameDialog.GetName(sNewName);
-bool nRet = false;
+bool bRet = false;
if (sNewName.isEmpty() || sCurrentName == sNewName)
-nRet = true;
+bRet = true;
else
{
-nRet = true;
+bRet = true;
SwDrawModel* pModel = rSh.getIDocumentDrawModelAccess().GetDrawModel();
SdrObjListIter aIter( *(pModel->GetPage(0)), IM_DEEPWITHGROUPS );
while( aIter.IsMore() )
@@ -611,12 +611,12 @@ IMPL_LINK_TYPED( SwDrawBaseShell, CheckGroupShapeNameHdl,
AbstractSvxObjectNameD
SdrObject* pTempObj = aIter.Next();
if ( pObj != pTempObj && pTempObj->GetName().equals(sNewName) )
{
-nRet = false;
+bRet = false;
break;
}
}
}
-return nRet;
+return bRet;
}
void SwDrawBaseShell::GetState(SfxItemSet& rSet)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 94306] Replace boost::noncopyable with plain C++11 deleted copy ctors
https://bugs.documentfoundation.org/show_bug.cgi?id=94306 --- Comment #19 from Siddharth Khabia --- i have replace uses of boost::noncopyable in a module but when i do boost/noncopyable , it shows its use as a header file. will only commenting out/deleteing those headere files work ? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Should we make it harder to assign a bug to yourself?
I have recently noticed a rush of what looks like newbies assigning bugs to themselves. (Those bugs that have their status changes sent to this list.) Doesn't experience show that in a large number of cases, this is wishful thinking, and once they realise how hard it is, many of them will just drop it and forget to assign back, so the bug stays assigned even if nobody actually is working on it? That then might prevent somebody else (who might me more skilled/motivated/lucky) from working on it. Should we make it harder to assign a bug to yourself? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/data/xls/pass/crash-6.xls |binary
sc/source/filter/excel/impop.cxx |5 +
2 files changed, 5 insertions(+)
New commits:
commit a28f5f963d16e6355aadd2f27c3348e7679e785b
Author: Caolán McNamara
Date: Sun Oct 4 08:23:11 2015 +0100
crash in Standardwidth
Change-Id: I9b781aaf98c16c83e12406ee38167814fb32cfc9
diff --git a/sc/qa/unit/data/xls/pass/crash-6.xls
b/sc/qa/unit/data/xls/pass/crash-6.xls
new file mode 100644
index 000..19544ba
Binary files /dev/null and b/sc/qa/unit/data/xls/pass/crash-6.xls differ
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index cc3c312..904209d 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -815,6 +815,11 @@ void ImportExcel::Hideobj()
void ImportExcel::Standardwidth()
{
sal_uInt16 nScWidth = XclTools::GetScColumnWidth( maStrm.ReaduInt16(),
GetCharWidth() );
+if (!pColRowBuff)
+{
+SAL_WARN("sc", "*ImportExcel::Standardwidth(): pColRowBuff is NULL!");
+return;
+}
pColRowBuff->SetDefWidth( nScWidth, true );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/common/UCB.py |2 +-
wizards/com/sun/star/wizards/web/FTPDialog.py |8
wizards/com/sun/star/wizards/web/WWD_Events.py |2 +-
wizards/com/sun/star/wizards/web/WWD_Startup.py |2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit e3f8eb8d3a594e3b8afa51c214f6c5c44d8dde4e
Author: Julien Nabet
Date: Sun Oct 4 01:00:57 2015 +0200
tdf#94743: Web Wizard: Cannot export in ftp
1) Fix value of constants RES_OK, RES_CANCEL and RES_HELP
http://opengrok.libreoffice.org/xref/core/offapi/com/sun/star/awt/PushButtonType.idl#29
2) self.updatePublishUI was wrong because FTP appears in second but there
are 2 elements
for each module (local dir, zip, ftp) in pubAware vector
comment was wrong:
- local takes elements 0 and 1
- zip takes elements 2 and 3
- ftp takes elements 4 (that's why "4" is the right value) and 5
see
http://opengrok.libreoffice.org/xref/core/wizards/com/sun/star/wizards/web/WWD_Startup.py#509
So fix value passed to self.updatePublishUI + comment
Just a bit of history:
before fix of tdf#92934: Web Wizard: Cannot Export Zip archive
(http://cgit.freedesktop.org/libreoffice/core/commit/?id=e72a4a3c2e1608e301daef0b6e87cc70d814e736),
the order seemed to be this one for pubAware: local, ftp, zip (whereas UI
order was already local, zip and ftp)
Perhaps the fix was wrong since there was a similar pb for tdf#94421: Web
Wizard, option shift when loading saved session
Anyway now the pubAware order is the same as UI order, it may help for
readability.
minor
a) increase space for lblStatus (there weren't enough room for some
locales, eg French)
b) replace use of copy3 (deprecated) by copy2
Change-Id: I27d3c2dd699fbe2d51a63e462c7b39e78895d1be
Reviewed-on: https://gerrit.libreoffice.org/19115
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/wizards/com/sun/star/wizards/common/UCB.py
b/wizards/com/sun/star/wizards/common/UCB.py
index 3689b14..4d97c01 100644
--- a/wizards/com/sun/star/wizards/common/UCB.py
+++ b/wizards/com/sun/star/wizards/common/UCB.py
@@ -64,7 +64,7 @@ class UCB(object):
def copy1(self, sourceDir, targetDir, verifier):
files = self.listFiles(sourceDir, verifier)
for i in range(len(files)):
- self.copy3(sourceDir, files[i], targetDir)
+ self.copy2(sourceDir, files[i], targetDir, "")
def copy2(self, sourceDir, filename, targetDir, targetName):
if (not self.fa.exists(targetDir, True)):
diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.py
b/wizards/com/sun/star/wizards/web/FTPDialog.py
index 25b1c6b..cb4e2c2 100644
--- a/wizards/com/sun/star/wizards/web/FTPDialog.py
+++ b/wizards/com/sun/star/wizards/web/FTPDialog.py
@@ -51,9 +51,9 @@ from com.sun.star.ucb.OpenMode import FOLDERS
# the members ip, username, and password (via the methods setXXX(...))
# for details see the ui.events.DataAware classes.
class FTPDialog(WizardDialog):
-RES_OK = 2
-RES_CANCEL = 3
-RES_HELP = 4
+RES_OK = 1
+RES_CANCEL = 2
+RES_HELP = 3
# A Constant used for the setLabel(int) method to change the
# status-display. "unknown" is the status when the user first
@@ -160,7 +160,7 @@ class FTPDialog(WizardDialog):
(0, 14, 68, 80, False, False, 14))
self.lblStatus = self.insertLabel("lblStatus",
PROPNAMES_LABEL,
-(8, self.resources.resFTPDisconnected, "lblStatus", 86, 82, 9,
99))
+(8, self.resources.resFTPDisconnected, "lblStatus", 86, 82, 9,
130))
self.ln3 = self.insertFixedLine("ln3",
PROPNAMES_LABEL,
(8, self.resources.resln3_value, "ln3", 6, 100, 10, 210))
diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py
b/wizards/com/sun/star/wizards/web/WWD_Events.py
index 03f2e12..cbb4dff 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Events.py
+++ b/wizards/com/sun/star/wizards/web/WWD_Events.py
@@ -434,7 +434,7 @@ class WWD_Events(WWD_Startup):
def setFTPPublish(self):
if self.showFTPDialog(self.getPublisher(FTP_PUBLISHER)):
self.getPublisher(FTP_PUBLISHER).cp_Publish = True
-self.updatePublishUI(2)
+self.updatePublishUI(4)
'''
show the ftp dialog
diff --git a/wizards/com/sun/star/wizards/web/WWD_Startup.py
b/wizards/com/sun/star/wizards/web/WWD_Startup.py
index 0138438..3d15335 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Startup.py
+++ b/wizards/com/sun/star/wizards/web/WWD_Startup.py
@@ -513,7 +513,7 @@ class WWD_Startup(WWD_General):
Objects on the same Vector need different DataObjectBinding,
I use this method...
@param data the CGPublish object
-@param i the number of the object (0 = local, 1 = ftp, 2 = zip)
+@param i the number of the object (0 = local, 1 = zip, 2 = ftp)
'''
def
