[Libreoffice-commits] core.git: desktop/source
desktop/source/app/crashreport.cxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 3650eacc9e4bf230d892eaac9366b7ebc16ed5c1 Author: Markus Mohrhard Date: Tue May 24 06:20:00 2016 +0200 fix previous commits Change-Id: I91e9f1d0f40dd3dd50b03a27ded2f96c71cd1ffd diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx index 4f1836d..830fe84 100644 --- a/desktop/source/app/crashreport.cxx +++ b/desktop/source/app/crashreport.cxx @@ -61,11 +61,11 @@ OUString getCrashUserProfileDirectory() rtl::Bootstrap::expandMacros(url); osl::Directory::create(url); -+#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID -+return url.copy(7); -+#elif defined WNT -+return url.copy(8); -+#endif +#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID +return url.copy(7); +#elif defined WNT +return url.copy(8); +#endif } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/shell.hxx|2
sfx2/source/control/shell.cxx | 101 --
2 files changed, 50 insertions(+), 53 deletions(-)
New commits:
commit 9129a4d689463b1212bc08f363108e858841c84d
Author: Xisco Fauli
Date: Sun May 22 17:32:29 2016 +0200
tdf#89329: use unique_ptr for pImpl in shell
Change-Id: Ie925d6c47d718ef46349c11b7450b1f2c1a93c21
Reviewed-on: https://gerrit.libreoffice.org/25318
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 9c82f1f..58440b2 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -134,7 +134,7 @@ class SFX2_DLLPUBLIC SfxShell: public SfxBroadcaster
{
friend class SfxObjectItem;
-SfxShell_Impl* pImp;
+std::unique_ptr< SfxShell_Impl > pImpl;
SfxItemPool*pPool;
::svl::IUndoManager*pUndoMgr;
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 007a8bf..2dd19e1 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -95,53 +95,50 @@ void SfxShell::EmptyStateStub(SfxShell *, SfxItemSet &)
}
SfxShell::SfxShell()
-: pImp(nullptr),
+: pImpl(new SfxShell_Impl),
pPool(nullptr),
pUndoMgr(nullptr)
{
-pImp = new SfxShell_Impl;
}
SfxShell::SfxShell( SfxViewShell *pViewSh )
-: pImp(nullptr),
+: pImpl(new SfxShell_Impl),
pPool(nullptr),
pUndoMgr(nullptr)
{
-pImp = new SfxShell_Impl;
-pImp->pViewSh = pViewSh;
+pImpl->pViewSh = pViewSh;
}
SfxShell::~SfxShell()
{
-delete pImp;
}
void SfxShell::SetName( const OUString &rName )
{
-pImp->aObjectName = rName;
+pImpl->aObjectName = rName;
}
const OUString& SfxShell::GetName() const
{
-return pImp->aObjectName;
+return pImpl->aObjectName;
}
SfxDispatcher* SfxShell::GetDispatcher() const
{
-return pImp->pFrame ? pImp->pFrame->GetDispatcher() : nullptr;
+return pImpl->pFrame ? pImpl->pFrame->GetDispatcher() : nullptr;
}
SfxViewShell* SfxShell::GetViewShell() const
{
-return pImp->pViewSh;
+return pImpl->pViewSh;
}
SfxViewFrame* SfxShell::GetFrame() const
{
-if ( pImp->pFrame )
-return pImp->pFrame;
-if ( pImp->pViewSh )
-return pImp->pViewSh->GetViewFrame();
+if ( pImpl->pFrame )
+return pImpl->pFrame;
+if ( pImpl->pViewSh )
+return pImpl->pViewSh->GetViewFrame();
return nullptr;
}
@@ -150,8 +147,8 @@ const SfxPoolItem* SfxShell::GetItem
sal_uInt16 nSlotId // Slot-Id of the querying s
) const
{
-auto const it = pImp->m_Items.find( nSlotId );
-if (it != pImp->m_Items.end())
+auto const it = pImpl->m_Items.find( nSlotId );
+if (it != pImpl->m_Items.end())
return it->second.get();
return nullptr;
}
@@ -171,12 +168,12 @@ void SfxShell::PutItem
SfxPoolItemHint aItemHint( pItem );
sal_uInt16 nWhich = rItem.Which();
-auto const it = pImp->m_Items.find(nWhich);
-if (it != pImp->m_Items.end())
+auto const it = pImpl->m_Items.find(nWhich);
+if (it != pImpl->m_Items.end())
{
// Replace Item
-pImp->m_Items.erase( it );
-pImp->m_Items.insert(std::make_pair(nWhich,
std::unique_ptr(pItem)));
+pImpl->m_Items.erase( it );
+pImpl->m_Items.insert(std::make_pair(nWhich,
std::unique_ptr(pItem)));
// if active, notify Bindings
SfxDispatcher *pDispat = GetDispatcher();
@@ -197,7 +194,7 @@ void SfxShell::PutItem
else
{
Broadcast( aItemHint );
-pImp->m_Items.insert(std::make_pair(nWhich,
std::unique_ptr(pItem)));
+pImpl->m_Items.insert(std::make_pair(nWhich,
std::unique_ptr(pItem)));
}
}
@@ -229,12 +226,12 @@ void SfxShell::SetUndoManager( ::svl::IUndoManager
*pNewUndoMgr )
SfxRepeatTarget* SfxShell::GetRepeatTarget() const
{
-return pImp->pRepeatTarget;
+return pImpl->pRepeatTarget;
}
void SfxShell::SetRepeatTarget( SfxRepeatTarget *pTarget )
{
-pImp->pRepeatTarget = pTarget;
+pImpl->pRepeatTarget = pTarget;
}
void SfxShell::Invalidate
@@ -320,8 +317,8 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, bool
bMDI )
if ( bMDI )
{
// Remember Frame, in which it was activated
-pImp->pFrame = pFrame;
-pImp->bActive = true;
+pImpl->pFrame = pFrame;
+pImpl->bActive = true;
}
// Notify Subclass
@@ -342,11 +339,11 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame,
bool bMDI )
// Only when it comes from a Frame
// (not when for instance by poping BASIC-IDE from AppDisp)
-if ( bMDI && pImp->pFrame == pFrame )
+if ( bMDI && pImpl->pFrame == pFrame )
{
// deliver
-pImp->pFrame = nullptr;
-pImp->bActive = false;
+pImpl->pFrame = nullptr;
+pImpl->bActive = false;
}
// No
[Libreoffice-commits] core.git: 3 commits - configmgr/source cppuhelper/source include/xmloff include/xmlreader sw/source unotools/source vcl/opengl vcl/source xmloff/source xmlreader/source
configmgr/source/valueparser.cxx |6 -
configmgr/source/xcdparser.cxx |2
cppuhelper/source/servicemanager.cxx |2
include/xmloff/txtimp.hxx| 18 ++---
include/xmlreader/xmlreader.hxx |2
sw/source/filter/xml/xmltbli.cxx |2
sw/source/filter/xml/xmltext.cxx |2
sw/source/uibase/envelp/labelcfg.cxx | 16 ++---
unotools/source/config/options.cxx |5 -
vcl/opengl/win/blocklist_parser.cxx |6 -
vcl/source/window/builder.cxx| 36 +--
xmloff/source/draw/ximpshap.cxx |2
xmloff/source/text/XMLChangeElementImportContext.cxx |2
xmloff/source/text/XMLFootnoteBodyImportContext.cxx |2
xmloff/source/text/XMLIndexBodyContext.cxx |2
xmloff/source/text/XMLSectionImportContext.cxx |2
xmloff/source/text/XMLTextFrameContext.cxx |2
xmloff/source/text/XMLTextHeaderFooterContext.cxx|2
xmloff/source/text/txtimp.cxx| 58 +--
xmlreader/source/xmlreader.cxx |6 -
20 files changed, 87 insertions(+), 88 deletions(-)
New commits:
commit 3a077c0c3f41575cdce7e7e2f65916b0e8eb85dd
Author: Noel Grandin
Date: Mon May 23 15:16:01 2016 +0200
tdf#99973 - Crash when changing Locale Setting in options
regression from commit 0f672545 "clang-tidy modernize-loop-convert in
toolkit to uui", probably because the list is being modified while the
loop is executing
Change-Id: I18cd21001aee132e06d577c469aed5eb46a16a7f
Reviewed-on: https://gerrit.libreoffice.org/25368
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/unotools/source/config/options.cxx
b/unotools/source/config/options.cxx
index e336775..435a453 100644
--- a/unotools/source/config/options.cxx
+++ b/unotools/source/config/options.cxx
@@ -68,9 +68,8 @@ void ConfigurationBroadcaster::NotifyListeners( sal_uInt32
nHint )
nHint |= m_nBlockedHint;
m_nBlockedHint = 0;
if ( mpList ) {
-for (ConfigurationListener* n : *mpList) {
-n->ConfigurationChanged( this, nHint );
-}
+for ( size_t n = 0; n < mpList->size(); n++ )
+(*mpList)[ n ]->ConfigurationChanged( this, nHint );
}
}
}
commit 2a16ad7e4a2646fb9df447bc0aab195af5ea770f
Author: Noel Grandin
Date: Mon May 23 15:13:14 2016 +0200
Convert XMLTextType to scoped enum
Change-Id: Iac147e57784e11d29f2b34e60dc3c624d6090c8b
Reviewed-on: https://gerrit.libreoffice.org/25367
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 92f2bf9..8bc38d6 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -352,14 +352,14 @@ enum XMLTextContourAttrTokens
};
enum XMLTextType
{
-XML_TEXT_TYPE_BODY,
-XML_TEXT_TYPE_CELL,
-XML_TEXT_TYPE_SHAPE,
-XML_TEXT_TYPE_TEXTBOX,
-XML_TEXT_TYPE_HEADER_FOOTER,
-XML_TEXT_TYPE_SECTION,
-XML_TEXT_TYPE_FOOTNOTE,
-XML_TEXT_TYPE_CHANGED_REGION
+Body,
+Cell,
+Shape,
+TextBox,
+HeaderFooter,
+Section,
+Footnote,
+ChangedRegion
};
/// variable type (for XMLSetVarFieldImportContext)
@@ -422,7 +422,7 @@ public:
SvXMLImport& rImport,
sal_uInt16 nPrefix, const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > &
xAttrList,
-XMLTextType eType = XML_TEXT_TYPE_SHAPE );
+XMLTextType eType = XMLTextType::Shape );
SvXMLTokenMap const& GetTextElemTokenMap();
SvXMLTokenMap const& GetTextPElemTokenMap();
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 0e65d2f..d8f0d8d 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -666,7 +666,7 @@ SvXMLImportContext
*SwXMLTableCellContext_Impl::CreateChildContext(
{
pContext = GetImport().GetTextImport()->CreateTextChildContext(
GetImport(), nPrefix, rLocalName, xAttrList,
-XML_TEXT_TYPE_CELL );
+XMLTextType::Cell );
}
}
diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx
index 084d5c9..58fea1d 100644
--- a/sw/source/filter/xml/xmltext.cxx
+++ b/sw/source/filter/xml/xmltext.cxx
@@ -60,7 +60,7 @@ SvXMLImportContext
*SwXMLBodyContentContext_Impl::CreateChildContext(
pContext = GetSwImport().GetTextImport()->CreateTextChildContext(
GetImport(), nPrefix, rLocalName, xAttrList,
- XML_TEXT_TYPE_BODY );
+ XMLTextType::Body );
if( !pContext )
pContext = new SvXMLImportCon
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/commontools/TSortIndex.cxx |8 connectivity/source/drivers/file/FResultSet.cxx |6 +++--- connectivity/source/drivers/mork/MResultSet.cxx |6 +++--- connectivity/source/inc/TSortIndex.hxx | 10 +- 4 files changed, 15 insertions(+), 15 deletions(-) New commits: commit 5785d6022bff839dc930f5d20b79afcc79808ac5 Author: Noel Grandin Date: Mon May 23 10:20:13 2016 +0200 Convert OKeyType to scoped enum Change-Id: Ic604991cdc0bf3e6dc5604a4a2b33f62b92f0915 Reviewed-on: https://gerrit.libreoffice.org/25355 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index 2af3810..2bb5541 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.cxx @@ -45,7 +45,7 @@ struct TKeyValueFunc : ::std::binary_functiongetKeyString(i).compareTo(rhs.second->getKeyString(i)); if (nRes < 0) @@ -54,7 +54,7 @@ struct TKeyValueFunc : ::std::binary_functiongetKeyDouble(i); double d2 = rhs.second->getKeyDouble(i); @@ -65,7 +65,7 @@ struct TKeyValueFunc : ::std::binary_functionhttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - comphelper/source connectivity/source editeng/source extensions/source framework/Library_fwi.mk framework/source include/comphelper include/framework includ
comphelper/source/misc/accessiblewrapper.cxx | 22 --
connectivity/source/drivers/dbase/DIndexIter.cxx | 19 -
connectivity/source/drivers/mork/MConnection.cxx |7
connectivity/source/drivers/mork/MConnection.hxx |4
connectivity/source/drivers/mysql/YDriver.cxx| 30 +-
connectivity/source/drivers/postgresql/pq_connection.cxx | 10
connectivity/source/inc/dbase/DIndexIter.hxx |5
editeng/source/xml/editsource.hxx|2
editeng/source/xml/xmltxtexp.cxx | 34 ---
extensions/source/bibliography/framectr.cxx | 22 --
extensions/source/bibliography/framectr.hxx |2
framework/Library_fwi.mk |1
framework/source/fwe/dispatch/interaction.cxx| 10
include/comphelper/accessiblewrapper.hxx |3
include/framework/interaction.hxx|2
include/sfx2/brokenpackageint.hxx|4
include/ucbhelper/proxydecider.hxx |2
reportdesign/inc/RptModel.hxx|4
reportdesign/source/core/sdr/RptModel.cxx| 10
sc/inc/datauno.hxx |6
sc/inc/dptabsrc.hxx |6
sc/source/core/data/dptabsrc.cxx | 35 ---
sc/source/ui/drawfunc/drtxtob.cxx| 16 -
sc/source/ui/inc/drtxtob.hxx |2
sc/source/ui/inc/editsh.hxx |2
sc/source/ui/unoobj/datauno.cxx | 46 +---
sc/source/ui/view/editsh.cxx | 16 -
sd/source/ui/inc/DrawViewShell.hxx |2
sd/source/ui/inc/OutlineViewShell.hxx|2
sd/source/ui/view/drviews7.cxx |7
sd/source/ui/view/drviewsa.cxx | 10
sd/source/ui/view/outlnvsh.cxx | 15 -
sfx2/source/appl/appuno.cxx | 14 -
stoc/source/defaultregistry/defaultregistry.cxx | 158 +++
svtools/source/inc/unoiface.hxx |2
svtools/source/uno/unoiface.cxx | 17 -
svtools/source/uno/unoimap.cxx | 15 -
svx/source/fmcomp/gridctrl.cxx | 13 -
ucbhelper/source/client/proxydecider.cxx | 12 -
xmloff/source/draw/animationexport.cxx | 14 -
xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 44 +---
xmlscript/source/xmlflat_imexp/xmlbas_import.hxx |4
xmlscript/source/xmllib_imexp/imp_share.hxx |4
xmlscript/source/xmllib_imexp/xmllib_import.cxx | 51 +---
xmlscript/source/xmlmod_imexp/imp_share.hxx |4
xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 23 --
46 files changed, 290 insertions(+), 443 deletions(-)
New commits:
commit 111de438ea3e512a541281dc0716cc728ea8d152
Author: Noel Grandin
Date: Mon May 23 13:53:42 2016 +0200
remove some manual ref-counting
triggered when I noticed a class doing acquire() in the constructor and
then release() in the destructor.
found mostly by
git grep -n -B5 -e '->release()'
Change-Id: Ie1abeaed75c1f861df185e3bde680272dbadc97f
Reviewed-on: https://gerrit.libreoffice.org/25363
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/comphelper/source/misc/accessiblewrapper.cxx
b/comphelper/source/misc/accessiblewrapper.cxx
index e106b9d..41fb4f5 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -347,18 +347,15 @@ namespace comphelper
,m_xInnerContext( _rxInnerAccessibleContext )
,m_xOwningAccessible( _rxOwningAccessible )
,m_xParentAccessible( _rxParentAccessible )
-,m_pChildMapper( nullptr )
-{
// initialize the mapper for our children
-m_pChildMapper = new OWrappedAccessibleChildrenManager(
getComponentContext() );
-m_pChildMapper->acquire();
-
+,m_xChildMapper( new OWrappedAccessibleChildrenManager(
getComponentContext() ) )
+{
// determine if we're allowed to cache children
Reference< XAccessibleStateSet > xStates(
m_xInnerContext->getAccessibleStateSet( ) );
OSL_ENSURE( xStates.is(),
"OAccessibleContextWrapperHelper::OAccessibleContextWrapperHelper: no inner
state set!" );
-m_pChildMapper->setTransientChildren( !xStates.is() ||
xStates->contains( AccessibleStateType::MANAGES_DESCENDANTS) );
+m_xChildMapper->setTransientChildren( !xStates.is() ||
xStates->contains( AccessibleStateType::MANAGES_DESCENDANTS) );
-m_pChildMapper->setOwningA
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/printergfx.hxx |6 +++---
vcl/unx/generic/print/bitmap_gfx.cxx | 32
2 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 93e61f9663df7e3986d88d6cb7db795af96a11b4
Author: Noel Grandin
Date: Mon May 23 10:17:16 2016 +0200
Convert ImageType to scoped enum
Change-Id: I7928fe7f1d6e96dcf42b03bd04fa9499371bbd98
Reviewed-on: https://gerrit.libreoffice.org/25354
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
index d4807fe..6f71cba 100644
--- a/vcl/inc/unx/printergfx.hxx
+++ b/vcl/inc/unx/printergfx.hxx
@@ -138,13 +138,13 @@ public:
virtual sal_uInt32 GetDepth () const = 0;
};
-typedef enum {
-InvalidType = 0,
+enum class ImageType {
+Invalid = 0,
TrueColorImage,
MonochromeImage,
PaletteImage,
GrayScaleImage
-} ImageType;
+};
/*
* printer raster operations
diff --git a/vcl/unx/generic/print/bitmap_gfx.cxx
b/vcl/unx/generic/print/bitmap_gfx.cxx
index d89d190..93ed0ce 100644
--- a/vcl/unx/generic/print/bitmap_gfx.cxx
+++ b/vcl/unx/generic/print/bitmap_gfx.cxx
@@ -523,10 +523,10 @@ PrinterGfx::writePS2ImageHeader (const Rectangle& rArea,
psp::ImageType nType)
sal_Int32 nDictType = 0;
switch (nType)
{
-case psp::TrueColorImage: nDictType = 0; break;
-case psp::PaletteImage:nDictType = 1; break;
-case psp::GrayScaleImage: nDictType = 2; break;
-case psp::MonochromeImage: nDictType = 3; break;
+case psp::ImageType::TrueColorImage: nDictType = 0; break;
+case psp::ImageType::PaletteImage:nDictType = 1; break;
+case psp::ImageType::GrayScaleImage: nDictType = 2; break;
+case psp::ImageType::MonochromeImage: nDictType = 3; break;
default: break;
}
sal_Int32 nCompressType = mbCompressBmp ? 1 : 0;
@@ -548,18 +548,18 @@ PrinterGfx::writePS2Colorspace(const PrinterBmp& rBitmap,
psp::ImageType nType)
{
switch (nType)
{
-case psp::GrayScaleImage:
+case psp::ImageType::GrayScaleImage:
WritePS (mpPageBody, "/DeviceGray setcolorspace\n");
break;
-case psp::TrueColorImage:
+case psp::ImageType::TrueColorImage:
WritePS (mpPageBody, "/DeviceRGB setcolorspace\n");
break;
-case psp::MonochromeImage:
-case psp::PaletteImage:
+case psp::ImageType::MonochromeImage:
+case psp::ImageType::PaletteImage:
{
sal_Int32 nChar = 0;
@@ -597,8 +597,8 @@ PrinterGfx::writePS2Colorspace(const PrinterBmp& rBitmap,
psp::ImageType nType)
void
PrinterGfx::DrawPS2GrayImage (const PrinterBmp& rBitmap, const Rectangle&
rArea)
{
-writePS2Colorspace(rBitmap, psp::GrayScaleImage);
-writePS2ImageHeader(rArea, psp::GrayScaleImage);
+writePS2Colorspace(rBitmap, psp::ImageType::GrayScaleImage);
+writePS2ImageHeader(rArea, psp::ImageType::GrayScaleImage);
std::unique_ptr xEncoder(mbCompressBmp ? new
LZWEncoder(mpPageBody)
: new Ascii85Encoder(mpPageBody));
@@ -616,8 +616,8 @@ PrinterGfx::DrawPS2GrayImage (const PrinterBmp& rBitmap,
const Rectangle& rArea)
void
PrinterGfx::DrawPS2MonoImage (const PrinterBmp& rBitmap, const Rectangle&
rArea)
{
-writePS2Colorspace(rBitmap, psp::MonochromeImage);
-writePS2ImageHeader(rArea, psp::MonochromeImage);
+writePS2Colorspace(rBitmap, psp::ImageType::MonochromeImage);
+writePS2ImageHeader(rArea, psp::ImageType::MonochromeImage);
std::unique_ptr xEncoder(mbCompressBmp ? new
LZWEncoder(mpPageBody)
: new Ascii85Encoder(mpPageBody));
@@ -648,8 +648,8 @@ PrinterGfx::DrawPS2MonoImage (const PrinterBmp& rBitmap,
const Rectangle& rArea)
void
PrinterGfx::DrawPS2PaletteImage (const PrinterBmp& rBitmap, const Rectangle&
rArea)
{
-writePS2Colorspace(rBitmap, psp::PaletteImage);
-writePS2ImageHeader(rArea, psp::PaletteImage);
+writePS2Colorspace(rBitmap, psp::ImageType::PaletteImage);
+writePS2ImageHeader(rArea, psp::ImageType::PaletteImage);
std::unique_ptr xEncoder(mbCompressBmp ? new
LZWEncoder(mpPageBody)
: new Ascii85Encoder(mpPageBody));
@@ -667,8 +667,8 @@ PrinterGfx::DrawPS2PaletteImage (const PrinterBmp& rBitmap,
const Rectangle& rAr
void
PrinterGfx::DrawPS2TrueColorImage (const PrinterBmp& rBitmap, const Rectangle&
rArea)
{
-writePS2Colorspace(rBitmap, psp::TrueColorImage);
-writePS2ImageHeader(rArea, psp::TrueColorImage);
+writePS2Colorspace(rBitmap, psp::ImageType::TrueColorImage);
+writePS2ImageHeader(rArea, psp::ImageType::TrueColorImage);
std::unique_ptr xEncoder(mbCompressBmp ? new
LZWEncoder(mpPageBody)
: new Ascii85Encoder(mpPageBody));
[Libreoffice-commits] online.git: loleaflet/Makefile loleaflet/unocommands.js
loleaflet/Makefile |1 +
loleaflet/unocommands.js | 11 +++
2 files changed, 12 insertions(+)
New commits:
commit fa8acdc8577abe337fcf80f3ebc493d57172c123
Author: Andras Timar
Date: Tue May 24 08:53:07 2016 +0200
loleaflet: enable l10n of context menu items which come from src files from
LO
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 22206fa..00a58a1 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -30,6 +30,7 @@ dist: all
pot:
xgettext --from-code=UTF-8 --keyword=_ --output=po/loleaflet-ui.pot \
+ unocommands.js \
dist/errormessages.js \
dist/toolbar/toolbar.js \
src/control/Control.Tabs.js \
diff --git a/loleaflet/unocommands.js b/loleaflet/unocommands.js
new file mode 100644
index 000..af53d00
--- /dev/null
+++ b/loleaflet/unocommands.js
@@ -0,0 +1,11 @@
+var CopyHyperlinkLocation = _('Copy Hyperlink');
+var DecrementLevel = _('Down One Level');
+var IncrementLevel = _('Up One Level');
+var EditAnnotation = _('Edit Comment');
+var InsertAnnotation = _('Insert Comment');
+var Merge = _('Merge');
+var MergeCells = _('Merge Cells...');
+var ObjectBackOne = _('Bring Forward');
+var ObjectForwardOne = _('Send Backward');
+var PasteSpecial = _('Paste Special');
+var PasteUnformatted = _('Unformatted Text');
___
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-1-0' - loleaflet/src
loleaflet/src/control/Control.ContextMenu.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6de9bca6c8ae9875079e439195b7189fb3e6217a
Author: Andras Timar
Date: Tue May 24 08:22:37 2016 +0200
loleaflet: l10n of submenus of context menus
(cherry picked from commit ea20a29007014fb5a7a7f6357c5544457b98b125)
diff --git a/loleaflet/src/control/Control.ContextMenu.js
b/loleaflet/src/control/Control.ContextMenu.js
index cdec3b2..1947fb1 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -130,7 +130,7 @@ L.Control.ContextMenu = L.Control.extend({
}
contextMenu[item.command] = {
- name: itemName,
+ name: _(itemName),
items: submenu
};
isLastItemText = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.ContextMenu.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ea20a29007014fb5a7a7f6357c5544457b98b125
Author: Andras Timar
Date: Tue May 24 08:22:37 2016 +0200
loleaflet: l10n of submenus of context menus
diff --git a/loleaflet/src/control/Control.ContextMenu.js
b/loleaflet/src/control/Control.ContextMenu.js
index cdec3b2..1947fb1 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -130,7 +130,7 @@ L.Control.ContextMenu = L.Control.extend({
}
contextMenu[item.command] = {
- name: itemName,
+ name: _(itemName),
items: submenu
};
isLastItemText = true;
___
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-1-0' - 2 commits - loleaflet/dist
loleaflet/dist/loleaflet.css |1 +
loleaflet/dist/toolbar.css|8 ++--
loleaflet/dist/toolbar/toolbar.js | 29 +++--
3 files changed, 22 insertions(+), 16 deletions(-)
New commits:
commit a15877094ba6d56d5af8bbac3bb8f119bceaf768
Author: Andras Timar
Date: Tue May 24 08:09:11 2016 +0200
loleaflet: unify casing of tooltips of toolbar buttons
(cherry picked from commit 8f35af58213788eff74f0795665d018d9ea4b181)
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index e9c4cec..f6a1d5d 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -30,7 +30,7 @@ $(function () {
{ type: 'button', id: 'strikeout', img: 'strikeout',
hint: _("Strikeout"), uno: 'Strikeout' },
{ type: 'break' },
{ type: 'html', id: 'fontcolor-html', html: '' },
- { type: 'button', id: 'fontcolor', img: 'color', hint:
_("Font Color") },
+ { type: 'button', id: 'fontcolor', img: 'color', hint:
_("Font color") },
{ type: 'html', id: 'backcolor-html', html: '' },
{ type: 'button', id: 'backcolor', img: 'backcolor',
hint: _("Highlighting") },
{ type: 'break' },
@@ -42,18 +42,18 @@ $(function () {
{ type: 'button', id: 'bullet', img: 'bullet', hint:
_("Bullets on/off"), uno: 'DefaultBullet' },
{ type: 'button', id: 'numbering', img: 'numbering',
hint: _("Numbering on/off"), uno: 'DefaultNumbering' },
{ type: 'break' },
- { type: 'button', id: 'incrementindent', img:
'incrementindent', hint: _("Increase Indent"), uno: 'IncrementIndent' },
- { type: 'button', id: 'decrementindent', img:
'decrementindent', hint: _("Decrease Indent"), uno: 'DecrementIndent' },
+ { type: 'button', id: 'incrementindent', img:
'incrementindent', hint: _("Increase indent"), uno: 'IncrementIndent' },
+ { type: 'button', id: 'decrementindent', img:
'decrementindent', hint: _("Decrease indent"), uno: 'DecrementIndent' },
{ type: 'break', id: 'incdecindent' },
- { type: 'button', id: 'annotation', img: 'annotation',
hint: _("Insert Comment"), uno: 'InsertAnnotation' },
- { type: 'button', id: 'insertgraphic', img:
'insertgraphic', hint: _("Insert Graphic") },
+ { type: 'button', id: 'annotation', img: 'annotation',
hint: _("Insert comment"), uno: 'InsertAnnotation' },
+ { type: 'button', id: 'insertgraphic', img:
'insertgraphic', hint: _("Insert graphic") },
{ type: 'html', id: 'inserttable-html', html: '' },
- { type: 'button', id: 'inserttable', img:
'inserttable', hint: _("Insert Table") },
+ { type: 'button', id: 'inserttable', img:
'inserttable', hint: _("Insert table") },
{ type: 'break' },
{ type: 'button', id: 'help', img: 'help', hint:
_("Help") },
{ type: 'html', id: 'right' },
{ type: 'button', id: 'more', img: 'more', hint:
_("More") },
- { type: 'button', id: 'close', img: 'closedoc', hint:
_("Close Document"), hidden: true }
+ { type: 'button', id: 'close', img: 'closedoc', hint:
_("Close document"), hidden: true }
],
onClick: function (e) {
onClick(e.target);
@@ -89,10 +89,10 @@ $(function () {
$('#spreadsheet-toolbar').w2toolbar({
name: 'spreadsheet-toolbar',
items: [
- { type: 'button', id: 'firstrecord', img:
'firstrecord', hidden: true, hint: _("First Sheet") },
- { type: 'button', id: 'prevrecord', img:
'prevrecord', hidden: true, hint: _("Previous Sheet") },
- { type: 'button', id: 'nextrecord', img:
'nextrecord', hidden: true, hint: _("Next Sheet") },
- { type: 'button', id: 'lastrecord', img:
'lastrecord', hidden: true, hint: _("Last Sheet") }
+ { type: 'button', id: 'firstrecord', img:
'firstrecord', hidden: true, hint: _("First sheet") },
+ { type: 'button', id: 'prevrecord', img:
'prevrecord', hidden: true, hint: _("Previous sheet") },
+ { type: 'button', id: 'nextrecord', img:
'nextrecord', hidden: true, hint: _("Next sheet") },
+ { type: 'button', id: 'lastrecord', img:
'lastrecord', hidden: true, hint: _("Last sheet") }
],
onClick: function (e) {
onClick(e.t
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/toolbar/toolbar.js | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 8f35af58213788eff74f0795665d018d9ea4b181
Author: Andras Timar
Date: Tue May 24 08:09:11 2016 +0200
loleaflet: unify casing of tooltips of toolbar buttons
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index e9c4cec..f6a1d5d 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -30,7 +30,7 @@ $(function () {
{ type: 'button', id: 'strikeout', img: 'strikeout',
hint: _("Strikeout"), uno: 'Strikeout' },
{ type: 'break' },
{ type: 'html', id: 'fontcolor-html', html: '' },
- { type: 'button', id: 'fontcolor', img: 'color', hint:
_("Font Color") },
+ { type: 'button', id: 'fontcolor', img: 'color', hint:
_("Font color") },
{ type: 'html', id: 'backcolor-html', html: '' },
{ type: 'button', id: 'backcolor', img: 'backcolor',
hint: _("Highlighting") },
{ type: 'break' },
@@ -42,18 +42,18 @@ $(function () {
{ type: 'button', id: 'bullet', img: 'bullet', hint:
_("Bullets on/off"), uno: 'DefaultBullet' },
{ type: 'button', id: 'numbering', img: 'numbering',
hint: _("Numbering on/off"), uno: 'DefaultNumbering' },
{ type: 'break' },
- { type: 'button', id: 'incrementindent', img:
'incrementindent', hint: _("Increase Indent"), uno: 'IncrementIndent' },
- { type: 'button', id: 'decrementindent', img:
'decrementindent', hint: _("Decrease Indent"), uno: 'DecrementIndent' },
+ { type: 'button', id: 'incrementindent', img:
'incrementindent', hint: _("Increase indent"), uno: 'IncrementIndent' },
+ { type: 'button', id: 'decrementindent', img:
'decrementindent', hint: _("Decrease indent"), uno: 'DecrementIndent' },
{ type: 'break', id: 'incdecindent' },
- { type: 'button', id: 'annotation', img: 'annotation',
hint: _("Insert Comment"), uno: 'InsertAnnotation' },
- { type: 'button', id: 'insertgraphic', img:
'insertgraphic', hint: _("Insert Graphic") },
+ { type: 'button', id: 'annotation', img: 'annotation',
hint: _("Insert comment"), uno: 'InsertAnnotation' },
+ { type: 'button', id: 'insertgraphic', img:
'insertgraphic', hint: _("Insert graphic") },
{ type: 'html', id: 'inserttable-html', html: '' },
- { type: 'button', id: 'inserttable', img:
'inserttable', hint: _("Insert Table") },
+ { type: 'button', id: 'inserttable', img:
'inserttable', hint: _("Insert table") },
{ type: 'break' },
{ type: 'button', id: 'help', img: 'help', hint:
_("Help") },
{ type: 'html', id: 'right' },
{ type: 'button', id: 'more', img: 'more', hint:
_("More") },
- { type: 'button', id: 'close', img: 'closedoc', hint:
_("Close Document"), hidden: true }
+ { type: 'button', id: 'close', img: 'closedoc', hint:
_("Close document"), hidden: true }
],
onClick: function (e) {
onClick(e.target);
@@ -89,10 +89,10 @@ $(function () {
$('#spreadsheet-toolbar').w2toolbar({
name: 'spreadsheet-toolbar',
items: [
- { type: 'button', id: 'firstrecord', img:
'firstrecord', hidden: true, hint: _("First Sheet") },
- { type: 'button', id: 'prevrecord', img:
'prevrecord', hidden: true, hint: _("Previous Sheet") },
- { type: 'button', id: 'nextrecord', img:
'nextrecord', hidden: true, hint: _("Next Sheet") },
- { type: 'button', id: 'lastrecord', img:
'lastrecord', hidden: true, hint: _("Last Sheet") }
+ { type: 'button', id: 'firstrecord', img:
'firstrecord', hidden: true, hint: _("First sheet") },
+ { type: 'button', id: 'prevrecord', img:
'prevrecord', hidden: true, hint: _("Previous sheet") },
+ { type: 'button', id: 'nextrecord', img:
'nextrecord', hidden: true, hint: _("Next sheet") },
+ { type: 'button', id: 'lastrecord', img:
'lastrecord', hidden: true, hint: _("Last sheet") }
],
onClick: function (e) {
onClick(e.target);
@@ -104,9 +104,9 @@ $(function () {
{ type: 'html', id: 'left' },
{ type: 'button', id: 'presentation', img:
'presen
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/loleaflet.css |1 +
loleaflet/dist/toolbar.css|8 ++--
loleaflet/dist/toolbar/toolbar.js |1 +
3 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 37b71b2289d1f465d8d5096fec8f803ba5f1942c
Author: Pranav Kant
Date: Tue May 24 11:27:12 2016 +0530
loleaflet: Leave 125px from left for branding logo
Change-Id: I92dbf92e4d140c8975198b14f6560c1d309202a8
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 15d7f9e..c7b4bed 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -23,6 +23,7 @@
height: 25px;
right: 0;
left: 0;
+padding-left: 125px;
z-index: 1030;
}
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index d5545af..42ae366 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -58,10 +58,14 @@
}
/* center the toolbar */
-#tb_presentation-toolbar_item_left,
-#tb_toolbar-up_item_left {
+#tb_presentation-toolbar_item_left {
width: 50%;
}
+/* leave space for branding logo */
+#tb_toolbar-up_item_left {
+width: 0;
+padding-left: 125px;
+}
#formulaInput {
height: 29px;
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index d1d0c92..e9c4cec 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -14,6 +14,7 @@ $(function () {
$('#toolbar-up').w2toolbar({
name: 'toolbar-up',
items: [
+ { type: 'html', id: 'left' },
{ type: 'button', id: 'save', img: 'save', hint:
_("Save"), uno: 'Save' },
{ type: 'break' },
{ type: 'button', id: 'undo', img: 'undo', hint:
_("Undo"), uno: 'Undo' },
___
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-1-0' - loleaflet/src
loleaflet/src/control/Control.Menubar.js | 42 +++
1 file changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 10fc5d3c6c3d07dbbd6425905754535988e89f07
Author: Andras Timar
Date: Tue May 24 08:00:52 2016 +0200
loleaflet: unify casing of menu items
(cherry picked from commit 633598bf83dd5870058410ddb2ca88f74b499fd2)
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index d89c05e..f592a60 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -20,7 +20,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Copy'), type: 'unocommand', uno: '.uno:Copy'},
{name: _('Paste'), type: 'unocommand', uno: '.uno:Paste'},
{type: 'separator'},
-
{name: _('Select All'), type: 'unocommand', uno:
'.uno:SelectAll'}]
+
{name: _('Select all'), type: 'unocommand', uno:
'.uno:SelectAll'}]
},
{name: _('Insert'), type: 'menu', menu: [{name:
_('Image'), id: 'insertgraphic', type: 'action'},
{name: _('Comment'), type: 'unocommand', uno:
'.uno:InsertAnnotation'}]
@@ -29,13 +29,13 @@ L.Control.Menubar = L.Control.extend({
{type: 'separator'},
{name: _('Zoom in'), id: 'zoomin', type: 'action'},
{name: _('Zoom out'), id: 'zoomout', type: 'action'},
-
{name: _('Zoom reset'), id: 'zoomreset', type: 'action'}]
+
{name: _('Reset zoom'), id: 'zoomreset', type: 'action'}]
},
- {name: _('Tables'), type: 'menu', menu: [{name:
_('Insert'), type: 'menu', menu: [{name: _('Rows Before'), type: 'unocommand',
uno: '.uno:InsertRowsBefore'},
-
{name: _('Rows After'), type: 'unocommand', uno:
'.uno:InsertRowsAfter'},
+ {name: _('Tables'), type: 'menu', menu: [{name:
_('Insert'), type: 'menu', menu: [{name: _('Rows before'), type: 'unocommand',
uno: '.uno:InsertRowsBefore'},
+
{name: _('Rows after'), type: 'unocommand', uno:
'.uno:InsertRowsAfter'},
{type: 'separator'},
-
{name: _('Columns Left'), type: 'unocommand', uno:
'.uno:InsertColumnsBefore'},
-
{name: _('Columns Right'), type: 'unocommand', uno:
'.uno:InsertColumnsAfter'}]},
+
{name: _('Columns left'), type: 'unocommand', uno:
'.uno:InsertColumnsBefore'},
+
{name: _('Columns right'), type: 'unocommand', uno:
'.uno:InsertColumnsAfter'}]},
{name: _('Delete'), type: 'menu', menu: [{name: _('Rows'),
type: 'unocommand', uno: '.uno:DeleteRows'},
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Menubar.js | 42 +++
1 file changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 633598bf83dd5870058410ddb2ca88f74b499fd2
Author: Andras Timar
Date: Tue May 24 08:00:52 2016 +0200
loleaflet: unify casing of menu items
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index d89c05e..f592a60 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -20,7 +20,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Copy'), type: 'unocommand', uno: '.uno:Copy'},
{name: _('Paste'), type: 'unocommand', uno: '.uno:Paste'},
{type: 'separator'},
-
{name: _('Select All'), type: 'unocommand', uno:
'.uno:SelectAll'}]
+
{name: _('Select all'), type: 'unocommand', uno:
'.uno:SelectAll'}]
},
{name: _('Insert'), type: 'menu', menu: [{name:
_('Image'), id: 'insertgraphic', type: 'action'},
{name: _('Comment'), type: 'unocommand', uno:
'.uno:InsertAnnotation'}]
@@ -29,13 +29,13 @@ L.Control.Menubar = L.Control.extend({
{type: 'separator'},
{name: _('Zoom in'), id: 'zoomin', type: 'action'},
{name: _('Zoom out'), id: 'zoomout', type: 'action'},
-
{name: _('Zoom reset'), id: 'zoomreset', type: 'action'}]
+
{name: _('Reset zoom'), id: 'zoomreset', type: 'action'}]
},
- {name: _('Tables'), type: 'menu', menu: [{name:
_('Insert'), type: 'menu', menu: [{name: _('Rows Before'), type: 'unocommand',
uno: '.uno:InsertRowsBefore'},
-
{name: _('Rows After'), type: 'unocommand', uno:
'.uno:InsertRowsAfter'},
+ {name: _('Tables'), type: 'menu', menu: [{name:
_('Insert'), type: 'menu', menu: [{name: _('Rows before'), type: 'unocommand',
uno: '.uno:InsertRowsBefore'},
+
{name: _('Rows after'), type: 'unocommand', uno:
'.uno:InsertRowsAfter'},
{type: 'separator'},
-
{name: _('Columns Left'), type: 'unocommand', uno:
'.uno:InsertColumnsBefore'},
-
{name: _('Columns Right'), type: 'unocommand', uno:
'.uno:InsertColumnsAfter'}]},
+
{name: _('Columns left'), type: 'unocommand', uno:
'.uno:InsertColumnsBefore'},
+
{name: _('Columns right'), type: 'unocommand', uno:
'.uno:InsertColumnsAfter'}]},
{name: _('Delete'), type: 'menu', menu: [{name: _('Rows'),
type: 'unocommand', uno: '.uno:DeleteRows'},
{name: _('Columns'), type: 'un
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f48ff355d0f815e110266783d7f6c7265abac64a
Author: Andras Timar
Date: Tue May 24 07:38:58 2016 +0200
loleaflet: enable l10n of 'Document saved' message
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index cb5524b..d1d0c92 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -633,7 +633,7 @@ map.on('commandstatechanged', function (e) {
$('#modifiedstatuslabel').html('');
}
else {
- $('#modifiedstatuslabel').html('Document saved');
+ $('#modifiedstatuslabel').html(_('Document saved'));
}
}
___
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 |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 63cbf9e4bb625a3b490f9ce19b19414dd0fd388e
Author: Andras Timar
Date: Tue May 24 07:38:58 2016 +0200
loleaflet: enable l10n of 'Document saved' message
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index cb5524b..d1d0c92 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -633,7 +633,7 @@ map.on('commandstatechanged', function (e) {
$('#modifiedstatuslabel').html('');
}
else {
- $('#modifiedstatuslabel').html('Document saved');
+ $('#modifiedstatuslabel').html(_('Document saved'));
}
}
___
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-1-0' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |1 +
1 file changed, 1 insertion(+)
New commits:
commit a868d3a781d9d3af56a782b10c6bd962e07ba2b6
Author: Andras Timar
Date: Tue May 24 07:24:29 2016 +0200
loleaflet: Set font of editlock popup message
(cherry picked from commit 131ed8420d494c2da84c6355f1a9e894d3006928)
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 81aeb91..cb5524b 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -849,6 +849,7 @@ map.on('editlock', function (e) {
$('#takeeditlabel').html(_('VIEWING'));
$('#tb_toolbar-down_item_takeedit')
.w2overlay({
+ class: 'loleaflet-font',
html: takeEditPopupMessage,
style: 'padding: 5px'
});
___
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 |1 +
1 file changed, 1 insertion(+)
New commits:
commit 131ed8420d494c2da84c6355f1a9e894d3006928
Author: Andras Timar
Date: Tue May 24 07:24:29 2016 +0200
loleaflet: Set font of editlock popup message
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 81aeb91..cb5524b 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -849,6 +849,7 @@ map.on('editlock', function (e) {
$('#takeeditlabel').html(_('VIEWING'));
$('#tb_toolbar-down_item_takeedit')
.w2overlay({
+ class: 'loleaflet-font',
html: takeEditPopupMessage,
style: 'padding: 5px'
});
___
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/leaflet.css |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 96dd4821e1f4ec22be5cbf5f9c511d536f526cb5
Author: Ashod Nakashian
Date: Mon May 23 23:12:25 2016 -0400
loleaflet: bccu#1827 Cursor does not blink in CS Writer under IE11
The animation name shouldn't be in quotes.
Change-Id: Ib2e4489e482dd1a22472588599df87cab55a6005
(cherry picked from commit 401e3b12778cc5c7883322e4543370acf270c479)
Reviewed-on: https://gerrit.libreoffice.org/25392
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index c3f8b8b..d986565 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -575,7 +575,7 @@ a.leaflet-control-buttons:hover:first-child {
animation: 1s blink step-end 0s infinite;
}
-@keyframes "blink" {
+@keyframes blink {
from, to {
background: black;
}
@@ -593,7 +593,7 @@ a.leaflet-control-buttons:hover:first-child {
}
}
-@-webkit-keyframes "blink" {
+@-webkit-keyframes blink {
from, to {
background: black;
}
@@ -602,7 +602,7 @@ a.leaflet-control-buttons:hover:first-child {
}
}
-@-ms-keyframes "blink" {
+@-ms-keyframes blink {
from, to {
background: black;
}
@@ -611,7 +611,7 @@ a.leaflet-control-buttons:hover:first-child {
}
}
-@-o-keyframes "blink" {
+@-o-keyframes blink {
from, to {
background: black;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/test
loolwsd/test/data/with_comment.odt |binary
loolwsd/test/httpwstest.cpp| 65 +
2 files changed, 65 insertions(+)
New commits:
commit dd4d2b026bf1e768160f7a6e1660f349cf84702f
Author: Ashod Nakashian
Date: Mon May 23 16:29:30 2016 -0400
loolwsd: test comment editing in Writer
Change-Id: I8449556960dedc2c66547016172acce688098cb3
(cherry picked from commit e96140b745283c0ae5e466001e0cf89cf945a398)
Reviewed-on: https://gerrit.libreoffice.org/25391
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/test/data/with_comment.odt
b/loolwsd/test/data/with_comment.odt
new file mode 100644
index 000..1e91d53
Binary files /dev/null and b/loolwsd/test/data/with_comment.odt differ
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 1847e59..43bd94a 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -79,6 +79,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST(testMaxColumn);
CPPUNIT_TEST(testMaxRow);
CPPUNIT_TEST(testInsertAnnotationWriter);
+CPPUNIT_TEST(testEditAnnotationWriter);
CPPUNIT_TEST(testInsertAnnotationCalc);
CPPUNIT_TEST_SUITE_END();
@@ -108,6 +109,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
void testMaxColumn();
void testMaxRow();
void testInsertAnnotationWriter();
+void testEditAnnotationWriter();
void testInsertAnnotationCalc();
void loadDoc(const std::string& documentURL);
@@ -1437,6 +1439,69 @@ void HTTPWSTest::testInsertAnnotationWriter()
CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: blah blah xyz"),
res);
}
+void HTTPWSTest::testEditAnnotationWriter()
+{
+std::string documentPath, documentURL;
+getDocumentPathAndURL("with_comment.odt", documentPath, documentURL);
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET,
documentURL);
+
+auto socket = loadDocAndGetSocket(_uri, documentURL);
+
+// Click in the body.
+sendTextFrame(socket, "mouse type=buttondown x=1600 y=1600 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "mouse type=buttonup x=1600 y=1600 count=1 buttons=1
modifier=0");
+// Read body text.
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+auto res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: Hello world"),
res);
+
+// Confirm that the comment is intact.
+sendTextFrame(socket, "mouse type=buttondown x=13855 y=1893 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "mouse type=buttonup x=13855 y=1893 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: blah blah xyz"),
res);
+
+// Can we still edit the coment?
+sendTextFrame(socket, "paste mimetype=text/plain;charset=utf-8\nand now
for something completely different");
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: and now for
something completely different"), res);
+
+// Close and reopen the same document and test again.
+socket->shutdown();
+std::cerr << "Reloading " << std::endl;
+socket = loadDocAndGetSocket(_uri, documentURL);
+
+// Confirm that the text is in the comment and not doc body.
+// Click in the body.
+sendTextFrame(socket, "mouse type=buttondown x=1600 y=1600 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "mouse type=buttonup x=1600 y=1600 count=1 buttons=1
modifier=0");
+// Read body text.
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: Hello world"),
res);
+
+// Confirm that the comment is still intact.
+sendTextFrame(socket, "mouse type=buttondown x=13855 y=1893 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "mouse type=buttonup x=13855 y=1893 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: and now for
something completely different"), res);
[Libreoffice-commits] online.git: loolwsd/test
loolwsd/test/httpwstest.cpp | 107
1 file changed, 107 insertions(+)
New commits:
commit d2ff39d29659833b454cc0901d7b5d9c9119ea97
Author: Ashod Nakashian
Date: Mon May 23 23:26:30 2016 -0400
loolwsd: test InsertAnnotation in Writer and Calc
Change-Id: I0f1b30467c3877316dc7c3122f04f3055b28cdd2
Reviewed-on: https://gerrit.libreoffice.org/25390
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 6919729..1847e59 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -78,6 +78,8 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST(testInactiveClient);
CPPUNIT_TEST(testMaxColumn);
CPPUNIT_TEST(testMaxRow);
+CPPUNIT_TEST(testInsertAnnotationWriter);
+CPPUNIT_TEST(testInsertAnnotationCalc);
CPPUNIT_TEST_SUITE_END();
@@ -105,6 +107,8 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
void testInactiveClient();
void testMaxColumn();
void testMaxRow();
+void testInsertAnnotationWriter();
+void testInsertAnnotationCalc();
void loadDoc(const std::string& documentURL);
@@ -1351,6 +1355,109 @@ void HTTPWSTest::testLimitCursor(
std::functionshutdown();
+std::cerr << "Reloading " << std::endl;
+socket = loadDocAndGetSocket(_uri, documentURL);
+
+// Confirm that the text is in the comment and not doc body.
+// Click in the body.
+sendTextFrame(socket, "mouse type=buttondown x=1600 y=1600 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "mouse type=buttonup x=1600 y=1600 count=1 buttons=1
modifier=0");
+// Read body text.
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: Hello world"),
res);
+
+// Confirm that the comment is still intact.
+sendTextFrame(socket, "mouse type=buttondown x=13855 y=1893 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "mouse type=buttonup x=13855 y=1893 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: and now for
something completely different"), res);
+
+// Can we still edit the coment?
+sendTextFrame(socket, "paste mimetype=text/plain;charset=utf-8\nblah blah
xyz");
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: blah blah xyz"),
res);
+}
+
+void HTTPWSTest::testInsertAnnotationCalc()
+{
+std::string documentPath, documentURL;
+getDocumentPathAndURL("setclientpart.ods", documentPath, documentURL);
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET,
documentURL);
+
+auto socket = loadDocAndGetSocket(_uri, documentURL);
+
+// Insert comment.
+sendTextFrame(socket, "uno .uno:InsertAnnotation");
+
+// Paste some text.
+sendTextFrame(socket, "paste mimetype=text/plain;charset=utf-8\naaa bbb
ccc");
+
+// Read it back.
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+auto res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationCalc ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: aaa bbb ccc"),
res);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(HTTPWSTest);
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
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-1-0' - loleaflet/dist
loleaflet/dist/leaflet.css |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 6d00383ae15b5290f2942bde1f4183f46a05afca
Author: Ashod Nakashian
Date: Mon May 23 23:12:25 2016 -0400
loleaflet: bccu#1827 Cursor does not blink in CS Writer under IE11
The animation name shouldn't be in quotes.
Change-Id: Ib2e4489e482dd1a22472588599df87cab55a6005
Reviewed-on: https://gerrit.libreoffice.org/25389
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index c3f8b8b..d986565 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -575,7 +575,7 @@ a.leaflet-control-buttons:hover:first-child {
animation: 1s blink step-end 0s infinite;
}
-@keyframes "blink" {
+@keyframes blink {
from, to {
background: black;
}
@@ -593,7 +593,7 @@ a.leaflet-control-buttons:hover:first-child {
}
}
-@-webkit-keyframes "blink" {
+@-webkit-keyframes blink {
from, to {
background: black;
}
@@ -602,7 +602,7 @@ a.leaflet-control-buttons:hover:first-child {
}
}
-@-ms-keyframes "blink" {
+@-ms-keyframes blink {
from, to {
background: black;
}
@@ -611,7 +611,7 @@ a.leaflet-control-buttons:hover:first-child {
}
}
-@-o-keyframes "blink" {
+@-o-keyframes blink {
from, to {
background: black;
}
___
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-1-0' - loolwsd/test
loolwsd/test/data/with_comment.odt |binary
loolwsd/test/httpwstest.cpp| 65 +
2 files changed, 65 insertions(+)
New commits:
commit 034bc5e1eda104543bdbd202c5f70d4ee6320153
Author: Ashod Nakashian
Date: Mon May 23 16:29:30 2016 -0400
loolwsd: test comment editing in Writer
Change-Id: I8449556960dedc2c66547016172acce688098cb3
Reviewed-on: https://gerrit.libreoffice.org/25388
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/test/data/with_comment.odt
b/loolwsd/test/data/with_comment.odt
new file mode 100644
index 000..1e91d53
Binary files /dev/null and b/loolwsd/test/data/with_comment.odt differ
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 4d14c7a..7e11c89 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -79,6 +79,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST(testMaxColumn);
CPPUNIT_TEST(testMaxRow);
CPPUNIT_TEST(testInsertAnnotationWriter);
+CPPUNIT_TEST(testEditAnnotationWriter);
CPPUNIT_TEST(testInsertAnnotationCalc);
CPPUNIT_TEST_SUITE_END();
@@ -108,6 +109,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
void testMaxColumn();
void testMaxRow();
void testInsertAnnotationWriter();
+void testEditAnnotationWriter();
void testInsertAnnotationCalc();
void loadDoc(const std::string& documentURL);
@@ -1542,6 +1544,69 @@ void HTTPWSTest::testInsertAnnotationWriter()
CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: blah blah xyz"),
res);
}
+void HTTPWSTest::testEditAnnotationWriter()
+{
+std::string documentPath, documentURL;
+getDocumentPathAndURL("with_comment.odt", documentPath, documentURL);
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET,
documentURL);
+
+auto socket = loadDocAndGetSocket(_uri, documentURL);
+
+// Click in the body.
+sendTextFrame(socket, "mouse type=buttondown x=1600 y=1600 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "mouse type=buttonup x=1600 y=1600 count=1 buttons=1
modifier=0");
+// Read body text.
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+auto res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: Hello world"),
res);
+
+// Confirm that the comment is intact.
+sendTextFrame(socket, "mouse type=buttondown x=13855 y=1893 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "mouse type=buttonup x=13855 y=1893 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: blah blah xyz"),
res);
+
+// Can we still edit the coment?
+sendTextFrame(socket, "paste mimetype=text/plain;charset=utf-8\nand now
for something completely different");
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: and now for
something completely different"), res);
+
+// Close and reopen the same document and test again.
+socket->shutdown();
+std::cerr << "Reloading " << std::endl;
+socket = loadDocAndGetSocket(_uri, documentURL);
+
+// Confirm that the text is in the comment and not doc body.
+// Click in the body.
+sendTextFrame(socket, "mouse type=buttondown x=1600 y=1600 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "mouse type=buttonup x=1600 y=1600 count=1 buttons=1
modifier=0");
+// Read body text.
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: Hello world"),
res);
+
+// Confirm that the comment is still intact.
+sendTextFrame(socket, "mouse type=buttondown x=13855 y=1893 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "mouse type=buttonup x=13855 y=1893 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: and now for
something completely different"), res);
+
+// Can we still edit the coment?
+sendTextFrame(socket, "paste
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/test
loolwsd/test/httpwstest.cpp | 106
1 file changed, 106 insertions(+)
New commits:
commit 53ff4b3b85c8e3e66919f69183e3c84d9daaa5e2
Author: Pranav Kant
Date: Wed May 11 19:16:52 2016 +0530
loolwsd: test InsertAnnotation in Writer and Calc
Change-Id: I124e6b9cede2629e78bc255245143d8c1946629f
Reviewed-on: https://gerrit.libreoffice.org/25387
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 0099ded..4d14c7a 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -78,6 +78,8 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST(testInactiveClient);
CPPUNIT_TEST(testMaxColumn);
CPPUNIT_TEST(testMaxRow);
+CPPUNIT_TEST(testInsertAnnotationWriter);
+CPPUNIT_TEST(testInsertAnnotationCalc);
CPPUNIT_TEST_SUITE_END();
@@ -105,6 +107,8 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
void testInactiveClient();
void testMaxColumn();
void testMaxRow();
+void testInsertAnnotationWriter();
+void testInsertAnnotationCalc();
void loadDoc(const std::string& documentURL);
@@ -1456,6 +1460,108 @@ void HTTPWSTest::testLimitCursor(
std::functionshutdown();
+std::cerr << "Reloading " << std::endl;
+socket = loadDocAndGetSocket(_uri, documentURL);
+
+// Confirm that the text is in the comment and not doc body.
+// Click in the body.
+sendTextFrame(socket, "mouse type=buttondown x=1600 y=1600 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "mouse type=buttonup x=1600 y=1600 count=1 buttons=1
modifier=0");
+// Read body text.
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: Hello world"),
res);
+
+// Confirm that the comment is still intact.
+sendTextFrame(socket, "mouse type=buttondown x=13855 y=1893 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "mouse type=buttonup x=13855 y=1893 count=1
buttons=1 modifier=0");
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: and now for
something completely different"), res);
+
+// Can we still edit the coment?
+sendTextFrame(socket, "paste mimetype=text/plain;charset=utf-8\nblah blah
xyz");
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationWriter ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: blah blah xyz"),
res);
+}
+
+void HTTPWSTest::testInsertAnnotationCalc()
+{
+std::string documentPath, documentURL;
+getDocumentPathAndURL("setclientpart.ods", documentPath, documentURL);
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET,
documentURL);
+
+auto socket = loadDocAndGetSocket(_uri, documentURL);
+
+// Insert comment.
+sendTextFrame(socket, "uno .uno:InsertAnnotation");
+
+// Paste some text.
+sendTextFrame(socket, "paste mimetype=text/plain;charset=utf-8\naaa bbb
ccc");
+
+// Read it back.
+sendTextFrame(socket, "uno .uno:SelectAll");
+sendTextFrame(socket, "gettextselection
mimetype=text/plain;charset=utf-8");
+auto res = getResponseLine(socket, "textselectioncontent:",
"insertAnnotationCalc ");
+CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: aaa bbb ccc"),
res);
+}
CPPUNIT_TEST_SUITE_REGISTRATION(HTTPWSTest);
___
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-1-0' - loolwsd/LOOLWSD.cpp
loolwsd/LOOLWSD.cpp |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit bcc7f117a725733fd8e3e53650b0d44f1ebc3489
Author: Ashod Nakashian
Date: Thu May 12 10:47:05 2016 -0400
loolwsd: initialize logging sooner and log server startup
Change-Id: I33ab52069be0b6c0dca5a741857aa86ae58b67cc
Reviewed-on: https://gerrit.libreoffice.org/24934
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
(cherry picked from commit 711b59a2bcd07eed2a56b9a1f6d18b7ef9709629)
Reviewed-on: https://gerrit.libreoffice.org/25385
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index f2b47ad..eff2fea 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1160,6 +1160,8 @@ LOOLWSD::~LOOLWSD()
void LOOLWSD::initialize(Application& self)
{
+Log::initialize("wsd");
+
if (geteuid() == 0)
{
throw std::runtime_error("Do not run as root. Please run as lool
user.");
@@ -1459,8 +1461,6 @@ Process::PID LOOLWSD::createForKit()
int LOOLWSD::main(const std::vector& /*args*/)
{
-Log::initialize("wsd");
-
if (DisplayVersion)
Util::displayVersionInfo("loolwsd");
@@ -1548,14 +1548,14 @@ int LOOLWSD::main(const std::vector&
/*args*/)
#endif
ThreadPool threadPool(NumPreSpawnedChildren*6, MAX_SESSIONS * 2);
HTTPServer srv(new ClientRequestHandlerFactory(fileServer), threadPool,
svs, params1);
-
+Log::info("Starting master server listening on " +
std::to_string(ClientPortNumber));
srv.start();
// And one on the port for child processes
SocketAddress addr2("127.0.0.1", MasterPortNumber);
ServerSocket svs2(addr2);
HTTPServer srv2(new PrisonerRequestHandlerFactory(), threadPool, svs2,
params2);
-
+Log::info("Starting prisoner server listening on " +
std::to_string(MasterPortNumber));
srv2.start();
// Fire the ForKit process; we are ready.
___
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-1-0' - loolwsd/Util.cpp loolwsd/Util.hpp
loolwsd/Util.cpp | 10 ++
loolwsd/Util.hpp | 12 +---
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 230b295d9162385cd48e1e9028093a92187cba13
Author: Ashod Nakashian
Date: Fri May 13 08:44:22 2016 -0400
loolwsd: improve temp file creation and delayed delete
Change-Id: I174b87f1aceaacee58121bc60edb420004e69c44
Reviewed-on: https://gerrit.libreoffice.org/24967
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
(cherry picked from commit 68b8b2af4f154f99612762c1ff2d7b2197a23162)
Reviewed-on: https://gerrit.libreoffice.org/25386
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index 519cb66..a814ae2 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include
#include "Common.hpp"
@@ -127,6 +128,15 @@ namespace Util
}
}
+std::string getTempFilePath(const std::string srcDir, const std::string&
srcFilename)
+{
+const std::string srcPath = srcDir + '/' + srcFilename;
+const std::string dstPath = Poco::Path::temp() +
encodeId(rng::getNext()) + '_' + srcFilename;
+Poco::File(srcPath).copyTo(dstPath);
+Poco::TemporaryFile::registerForDeletion(dstPath);
+return dstPath;
+}
+
bool windowingAvailable()
{
return std::getenv("DISPLAY") != nullptr;
diff --git a/loolwsd/Util.hpp b/loolwsd/Util.hpp
index 28cdb94..5340899 100644
--- a/loolwsd/Util.hpp
+++ b/loolwsd/Util.hpp
@@ -90,17 +90,7 @@ namespace Util
/// Primarily used by tests to avoid tainting the originals.
/// srcDir shouldn't end with '/' and srcFilename shouldn't contain '/'.
/// Returns the created file path.
-inline
-std::string getTempFilePath(const std::string srcDir, const std::string&
srcFilename)
-{
-const std::string srcPath = srcDir + '/' + srcFilename;
-
-std::string dstPath = std::tmpnam(nullptr);
-dstPath += '_' + srcFilename;
-
-Poco::File(srcPath).copyTo(dstPath);
-return dstPath;
-}
+std::string getTempFilePath(const std::string srcDir, const std::string&
srcFilename);
/// Returns the name of the signal.
const char *signalName(int signo);
___
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-1-0' - loolwsd/LOOLWSD.cpp
loolwsd/LOOLWSD.cpp |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 71b7b68f6a32484c3be50fc99179daa0a3c09e4c
Author: Ashod Nakashian
Date: Thu May 12 10:37:54 2016 -0400
loolwsd: correct error report while loading
Change-Id: I4e5e4dd1318144255294011c70c6d2bbfd74c1d8
Reviewed-on: https://gerrit.libreoffice.org/24932
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
(cherry picked from commit 9376156ac34de6c28455ef1c14a65dcd0230ba83)
Reviewed-on: https://gerrit.libreoffice.org/25384
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 6a726de..f2b47ad 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -590,8 +590,9 @@ private:
// Remove.
std::unique_lock lock(docBrokersMutex);
docBrokers.erase(docKey);
-throw
WebSocketErrorMessageException(SERVICE_UNAVALABLE_INTERNAL_ERROR);
}
+
+throw
WebSocketErrorMessageException(SERVICE_UNAVALABLE_INTERNAL_ERROR);
}
// Validate the URI and Storage before moving on.
@@ -820,7 +821,7 @@ public:
const std::string msg = std::string("error: ") +
exc.what();
ws->sendFrame(msg.data(), msg.size());
// abnormal close frame handshake
-ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY,
exc.what());
+ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, msg);
}
catch (const std::exception& exc2)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - bin/upload_symbols.py config_host.mk.in configure.ac Makefile.gbuild Makefile.in
Makefile.gbuild |3 +++
Makefile.in |5 +
bin/upload_symbols.py | 37 +++--
config_host.mk.in |1 +
configure.ac | 17 +
5 files changed, 57 insertions(+), 6 deletions(-)
New commits:
commit 0cd5d93c1e313d8d71f3338451c683c7aeef8f10
Author: Markus Mohrhard
Date: Tue May 24 04:27:46 2016 +0200
make debuggin failures a bit easier
Change-Id: I0b17ab513e05ee95c378399348557cfee8341fb0
diff --git a/bin/upload_symbols.py b/bin/upload_symbols.py
index f9aa40c..fd4246e 100755
--- a/bin/upload_symbols.py
+++ b/bin/upload_symbols.py
@@ -14,6 +14,7 @@ def detect_platform():
def main():
if len(sys.argv) != 4:
+print(sys.argv)
print("Invalid number of parameters")
sys.exit(1)
commit 1e4e503a530064d9d91c392a7bec7502b01d
Author: Markus Mohrhard
Date: Tue May 24 04:27:18 2016 +0200
add build system part for upload crashreport symbols
Change-Id: Ib8dc0267034716740ba6d7f60cf635adc4bd1561
diff --git a/Makefile.gbuild b/Makefile.gbuild
index 8c41a28..bcfa569 100644
--- a/Makefile.gbuild
+++ b/Makefile.gbuild
@@ -20,4 +20,7 @@ include $(SRCDIR)/solenv/gbuild/gbuild.mk
$(eval $(call
gb_Module_make_global_targets,$(SRCDIR)/RepositoryModule_$(gb_Side).mk))
+upload-symbols:
+ bin/upload_symbols.py $(WORKDIR)/symbols.zip $(BREAKPAD_SYMBOL_CONFIG)
"$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)"
+
# vim: set noet sw=4 ts=4:
diff --git a/Makefile.in b/Makefile.in
index 155c200b..5da8e93 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -386,6 +386,9 @@ symbols:
$(SRCDIR)/bin/symbolstore.py
$(WORKDIR)/UnpackedTarball/breakpad/src/tools/linux/dump_syms/dump_syms
$(WORKDIR)/symbols/ $(INSTDIR)/program/*
cd $(WORKDIR)/symbols/ && zip -r $(WORKDIR)/symbols.zip *
+upload-symbols:
+ $(MAKE) -f $(SRCDIR)/Makefile.gbuild upload-symbols
+
dump-deps:
@$(SRCDIR)/bin/module-deps.pl $(MAKE) $(SRCDIR)/Makefile.gbuild
diff --git a/config_host.mk.in b/config_host.mk.in
index 60b87bd..ddd144e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -42,6 +42,7 @@ export BOOST_IOSTREAMS_LIB=@BOOST_IOSTREAMS_LIB@
export BOOST_LDFLAGS=@BOOST_LDFLAGS@
export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@
export BRAND_INTRO_IMAGES=@BRAND_INTRO_IMAGES@
+export BREAKPAD_SYMBOL_CONFIG=@BREAKPAD_SYMBOL_CONFIG@
export BSH_JAR=@BSH_JAR@
export BUILD_PLATFORM=@build@
export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@
diff --git a/configure.ac b/configure.ac
index 6dea282..091abb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2023,6 +2023,12 @@ AC_ARG_WITH(ant-home,
of the entire distribution.]),
,)
+AC_ARG_WITH(symbol-config,
+AS_HELP_STRING([--with-symbol-config],
+[Configuration for the crashreport symbol upload]),
+[],
+[$with_symbol_config=no])
+
AC_ARG_WITH(export-validation,
AS_HELP_STRING([--with-export-validation],
[If you want the exported files to be validated. Right now limited to
OOXML and ODF files.
@@ -9135,6 +9141,17 @@ else
AC_DEFINE(ENABLE_BREAKPAD)
AC_DEFINE(HAVE_FEATURE_BREAKPAD, 1)
BUILD_TYPE="$BUILD_TYPE BREAKPAD"
+
+AC_MSG_CHECKING([for crashreport config])
+if test "$with_symbol_config" = "no"; then
+BREAKPAD_SYMBOL_CONFIG="invalid"
+AC_MSG_RESULT([no])
+else
+BREAKPAD_SYMBOL_CONFIG="$with_symbol_config"
+AC_DEFINE(BREAKPAD_SYMBOL_CONFIG)
+AC_MSG_RESULT([yes])
+fi
+AC_SUBST(BREAKPAD_SYMBOL_CONFIG)
fi
AC_SUBST(ENABLE_BREAKPAD)
commit d586e3bf04d486aa28709ff98926e2817629d59f
Author: Markus Mohrhard
Date: Tue May 24 03:29:48 2016 +0200
fix the crashreport symbol upload script
Change-Id: Id99ac569f6c9f839002798b6f5794b05ed228988
diff --git a/bin/upload_symbols.py b/bin/upload_symbols.py
old mode 100644
new mode 100755
index 483ac3b..f9aa40c
--- a/bin/upload_symbols.py
+++ b/bin/upload_symbols.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
#
# This Source Code Form is subject to the terms of the Mozilla Public
@@ -6,17 +7,40 @@
#
import requests, sys
+import platform, configparser
+
+def detect_platform():
+return platform.system()
def main():
-if len(sys.argv) != 3:
+if len(sys.argv) != 4:
print("Invalid number of parameters")
sys.exit(1)
-url = "http://vm171.documentfoundation.org/upload/";
-files = {'symbols': open(sys.argv[1], 'rb'), 'comment': sys.argv[2]}
-comment = {'comment': sys.argv[2]}
-r = requests.post(url, files = files, data = {"comment":"whatever",
"tempt":"tempt"})
-print(r)
+upload_url = "http://vm171.documentfoundation.org/upload/";
+login_url = "http://vm171.documentfoundation.org/accounts/login/";
+
+config = config
[Libreoffice-commits] core.git: svtools/source
svtools/source/control/ruler.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 17e329e4092a2e49f47452d89fea51eb702d4fd2 Author: Tomaž Vajngerl Date: Tue May 24 11:01:46 2016 +0900 ruler: close the polygon when drawing indent handle (gtk3, gl) Change-Id: I9d1d20f889f73c73a1b861485a956a25f743e245 diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index aa2bf9d..7e4dbb9 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -795,7 +795,9 @@ void Ruler::ImplDrawIndent(vcl::RenderContext& rRenderContext, const tools::Poly rRenderContext.SetLineColor(rStyleSettings.GetDarkShadowColor()); rRenderContext.SetFillColor(bIsHit ? rStyleSettings.GetDarkShadowColor() : rStyleSettings.GetWorkspaceColor()); -rRenderContext.DrawPolygon(rPoly); +tools::Polygon aPolygon(rPoly); +aPolygon.Optimize(PolyOptimizeFlags::CLOSE); +rRenderContext.DrawPolygon(aPolygon); } void Ruler::ImplDrawIndents(vcl::RenderContext& rRenderContext, long nMin, long nMax, long nVirTop, long nVirBottom) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/CppunitTest_starmath_qa_cppunit.mk starmath/qa starmath/source
starmath/CppunitTest_starmath_qa_cppunit.mk |1
starmath/qa/cppunit/test_cursor.cxx | 172
starmath/source/cursor.cxx |2
3 files changed, 175 insertions(+)
New commits:
commit 4ab3149381352c86cb84fc01fe69b2c7929c98fb
Author: Takeshi Abe
Date: Mon May 23 20:00:48 2016 +0900
starmath: Fix missing call of AnnotationSelection() for SmCursor::Copy
... with unit tests of Copy/Cut/Paste.
Change-Id: I74dd6f235b52ef2c1388ea0d15d32af0fb30b2c8
Reviewed-on: https://gerrit.libreoffice.org/25362
Tested-by: Jenkins
Reviewed-by: Takeshi Abe
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk
b/starmath/CppunitTest_starmath_qa_cppunit.mk
index 2130a22..efaa7b3 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -53,6 +53,7 @@ $(eval $(call
gb_CppunitTest_use_libraries,starmath_qa_cppunit,\
))
$(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\
+starmath/qa/cppunit/test_cursor \
starmath/qa/cppunit/test_nodetotextvisitors \
starmath/qa/cppunit/test_starmath \
))
diff --git a/starmath/qa/cppunit/test_cursor.cxx
b/starmath/qa/cppunit/test_cursor.cxx
new file mode 100644
index 000..51e555f
--- /dev/null
+++ b/starmath/qa/cppunit/test_cursor.cxx
@@ -0,0 +1,172 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+#include
+
+typedef tools::SvRef SmDocShellRef;
+
+using namespace ::com::sun::star;
+
+namespace {
+
+class Test : public test::BootstrapFixture {
+
+public:
+// init
+virtual void setUp() override;
+virtual void tearDown() override;
+
+// tests
+void testCopyPaste();
+void testCopySelectPaste();
+void testCutPaste();
+void testCutSelectPaste();
+
+CPPUNIT_TEST_SUITE(Test);
+CPPUNIT_TEST(testCopyPaste);
+CPPUNIT_TEST(testCopySelectPaste);
+CPPUNIT_TEST(testCutPaste);
+CPPUNIT_TEST(testCutSelectPaste);
+CPPUNIT_TEST_SUITE_END();
+
+private:
+SmDocShellRef xDocShRef;
+};
+
+void Test::setUp()
+{
+BootstrapFixture::setUp();
+
+SmGlobals::ensure();
+
+xDocShRef = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT);
+}
+
+void Test::tearDown()
+{
+xDocShRef.Clear();
+BootstrapFixture::tearDown();
+}
+
+void Test::testCopyPaste()
+{
+OUString sInput("a * b + c");
+std::unique_ptr xTree(SmParser().Parse(sInput));
+xTree->Prepare(xDocShRef->GetFormat(), *xDocShRef);
+
+SmCursor aCursor(xTree.get(), xDocShRef);
+ScopedVclPtrInstance pOutputDevice;
+
+// go to the position at "*"
+aCursor.Move(pOutputDevice, MoveRight);
+// select "* b" and then copy
+aCursor.Move(pOutputDevice, MoveRight, false);
+aCursor.Move(pOutputDevice, MoveRight, false);
+aCursor.Copy();
+// go to the right end and then paste
+aCursor.Move(pOutputDevice, MoveRight);
+aCursor.Move(pOutputDevice, MoveRight);
+aCursor.Paste();
+
+CPPUNIT_ASSERT_EQUAL(OUString(" { a * b + c * b } "),
xDocShRef->GetText());
+}
+
+void Test::testCopySelectPaste()
+{
+OUString sInput("a * b + c");
+std::unique_ptr xTree(SmParser().Parse(sInput));
+xTree->Prepare(xDocShRef->GetFormat(), *xDocShRef);
+
+SmCursor aCursor(xTree.get(), xDocShRef);
+ScopedVclPtrInstance pOutputDevice;
+
+// go to the right end
+for (int i=0;i<5;i++)
+aCursor.Move(pOutputDevice, MoveRight);
+// select "b + c" and then copy
+aCursor.Move(pOutputDevice, MoveLeft, false);
+aCursor.Move(pOutputDevice, MoveLeft, false);
+aCursor.Move(pOutputDevice, MoveLeft, false);
+aCursor.Copy();
+// go to the left end
+aCursor.Move(pOutputDevice, MoveLeft);
+aCursor.Move(pOutputDevice, MoveLeft);
+// select "a" and then paste
+aCursor.Move(pOutputDevice, MoveRight, false);
+aCursor.Paste();
+
+CPPUNIT_ASSERT_EQUAL(OUString(" { b + c * b + c } "),
xDocShRef->GetText());
+}
+
+void Test::testCutPaste()
+{
+OUString sInput("a * b + c");
+std::unique_ptr xTree(SmParser().Parse(sInput));
+xTree->Prepare(xDocShRef->GetFormat(), *xDocShRef);
+
+SmCursor aCursor(xTree.get(), xDocShRef);
+ScopedVclPtrInstance pOutputDevice;
+
+// go to the position at "*"
+aCursor.Move(pOutputDevice, MoveRight);
+// select "* b" and then cut
+aCursor.Move(pOutputDevice, MoveRight, false);
+aCursor.Move(pOutputDevice, MoveRight, false);
+aCursor.Cut();
+// go to the left end and then paste
+aCursor.Move(pOutputDevice, MoveRight);
+aCursor.Move(pOutputDevice, MoveRigh
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/functions/fods/dstdevp.fods | 1357 1 file changed, 1357 insertions(+) New commits: commit 91585d248c7eae60fde0956da3da95c55fafdbcc Author: ZdenÄk Crhonek Date: Mon May 23 19:53:21 2016 +0200 add DSTDEVP test case Change-Id: I263ed01d155c5939ff52487bcf0920acab4c1e5c Reviewed-on: https://gerrit.libreoffice.org/25374 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard diff --git a/sc/qa/unit/data/functions/fods/dstdevp.fods b/sc/qa/unit/data/functions/fods/dstdevp.fods new file mode 100644 index 000..bfc321a --- /dev/null +++ b/sc/qa/unit/data/functions/fods/dstdevp.fods @@ -0,0 +1,1357 @@ + + +http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:form x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> + 2016-05-23T19:52:21.032366237P0D1LibreOfficeDev/5.2.0.0.alpha1$Linux_X86_64 LibreOffice_project/369ca1d72bc877c6ccce991c92ae1a246956ca57 + + + 0 + 0 + 22009 + 4261 + + + view1 + + + 3 + 16 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + 9 + 5 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + Sheet1 + 1241 + 0 + 100 + 60 + false + true + true + true + 12632256 + true + true + true + true + false + false + false + 1270 + 1270 + 1 + 1 + true + + + + + 7 + false + false + true + true + false + false + false + 1270 + 1270 + true + true + true + true + true + false + 12632256 + false + Lexmark-E352dn + + + en + US + + + + + + true + true + 3 + 1 + true + 1 + true + qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY= + false + 0 + + + + + http://openoffice.org/2004/office"; xmlns:xlink="http://www.w3.org/1999/xlink";> + + + + + + + + + + + + + + + + + + + + + + + + + KÄ + + + + - + + + KÄ + + + + £ + + + + - + £ + + + + + £ + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + + + + + ( + + ) + + + + + + + + ( + + ) + + + + £ + + + + + - + £ + + + + + + £ + + + + + - + £ + + + + + + $
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/functions/fods/dstdev.fods | 1457 + 1 file changed, 1457 insertions(+) New commits: commit 04dd8cb484d623720361ab7537a902b3e70f389b Author: ZdenÄk Crhonek Date: Mon May 23 15:26:54 2016 +0200 add DSTDEV test case Change-Id: Ie7a597ec7799d4e6fcba760b5cd2e20ead53601a Reviewed-on: https://gerrit.libreoffice.org/25371 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/qa/unit/data/functions/fods/dstdev.fods b/sc/qa/unit/data/functions/fods/dstdev.fods new file mode 100644 index 000..a5c04ac --- /dev/null +++ b/sc/qa/unit/data/functions/fods/dstdev.fods @@ -0,0 +1,1457 @@ + + +http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:form x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> + 2016-05-19T20:41:43.049324634P0D1LibreOfficeDev/5.2.0.0.alpha1$Linux_X86_64 LibreOffice_project/eb7593daa4bac21bd68182c8bbbd3ee3bd7b64dd + + + 0 + 0 + 27162 + 25809 + + + view1 + + + 3 + 17 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + 4 + 4 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + Sheet2 + 1241 + 0 + 100 + 60 + false + true + true + true + 12632256 + true + true + true + true + false + false + false + 1270 + 1270 + 1 + 1 + true + + + + + 7 + false + false + true + true + false + false + false + 1270 + 1270 + true + true + true + true + true + false + 12632256 + false + Lexmark-E352dn + + + en + US + + + + + + true + true + 3 + 1 + true + 1 + true + jQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAswAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AAASAENPTVBBVF9EVVBMRVhfTU9ERQoARFVQTEVYX09GRg== + false + 0 + + + + + http://openoffice.org/2004/office"; xmlns:xlink="http://www.w3.org/1999/xlink";> + + + + + + + + + + + + + + + + + + + + + + + + + KÄ + + + + - + + + KÄ + + + + £ + + + + - + £ + + + + + £ + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + + + + + ( + + ) + + + + + + + + ( + + ) + + + + £ + + + + + - + £ + + + + + + £ + + + + + - + £ + + + + + + $ + + + + + - + $ + + + +
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/crashreport.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 8857877aa609de4c8476330c34a24906f5fdc05b Author: Markus Mohrhard Date: Mon May 23 23:47:17 2016 +0200 return paths and not URLs Change-Id: I03553a1fe98ac7ac780333b2ec247ed0cd781ffb Reviewed-on: https://gerrit.libreoffice.org/25379 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx index f1b0828..4f1836d 100644 --- a/desktop/source/app/crashreport.cxx +++ b/desktop/source/app/crashreport.cxx @@ -61,7 +61,11 @@ OUString getCrashUserProfileDirectory() rtl::Bootstrap::expandMacros(url); osl::Directory::create(url); -return url; ++#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID ++return url.copy(7); ++#elif defined WNT ++return url.copy(8); ++#endif } } ___ 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/crashreport.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 73755fdefbf841d0ac9e504c00c0d032ed5daad8 Author: Markus Mohrhard Date: Mon May 23 23:11:13 2016 +0200 update the minidump location as soon as possible Change-Id: I7525ba7ff48b6df51ce8f7fdccf5ff512cdfec89 Reviewed-on: https://gerrit.libreoffice.org/25378 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx index b9af1b7..f1b0828 100644 --- a/desktop/source/app/crashreport.cxx +++ b/desktop/source/app/crashreport.cxx @@ -23,6 +23,8 @@ osl::Mutex CrashReporter::maMutex; #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID #include +#elif defined WNT +#include #endif google_breakpad::ExceptionHandler* CrashReporter::mpExceptionHandler = nullptr; @@ -72,7 +74,8 @@ void CrashReporter::updateMinidumpLocation() #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID google_breakpad::MinidumpDescriptor descriptor(aOStringUrl.getStr()); mpExceptionHandler->set_minidump_descriptor(descriptor); -#else +#elif defined WNT +mpExceptionHandler->set_dump_path(aURL.getStr()); #endif } ___ 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/sofficemain.cxx | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit cee4cc9bb3b5f0121a8f57e4203c2cdabffe6715
Author: Markus Mohrhard
Date: Mon May 23 23:48:58 2016 +0200
handle std::string vs std::wstring during export
Change-Id: I00a32eb465b54e2a2747eebd00605212f14e5384
Reviewed-on: https://gerrit.libreoffice.org/25380
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/desktop/source/app/sofficemain.cxx
b/desktop/source/app/sofficemain.cxx
index 40bd1dd..70c2287 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -51,6 +51,8 @@
#include
#elif defined WNT
#include
+#include
+#include
#endif
#endif
@@ -78,16 +80,19 @@ static bool dumpCallback(const
google_breakpad::MinidumpDescriptor& descriptor,
return succeeded;
}
#elif defined WNT
-static bool dumpCallback(const wchar_t* path, const wchar_t* /*id*/,
+static bool dumpCallback(const wchar_t* path, const wchar_t* id,
void* /*context*/, EXCEPTION_POINTERS* /*exinfo*/,
MDRawAssertionInfo* /*assertion*/,
bool succeeded)
{
std::string ini_path = CrashReporter::getIniFileName();
std::ofstream minidump_file(ini_path, std::ios_base::app);
-minidump_file << "DumpFile=" << path << "\n";;
+// TODO: moggi: can we avoid this conversion
+std::wstring_convert> conv1;
+std::string aPath = conv1.to_bytes(std::wstring(path)) +
conv1.to_bytes(std::wstring(id));
+minidump_file << "DumpFile=" << aPath << "\n";;
minidump_file.close();
-SAL_WARN("desktop", "minidump generated: " << path);
+SAL_WARN("desktop", "minidump generated: " << aPath);
return succeeded;
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Dictionary_en.mk
Dictionary_en.mk |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 697bbfa625583164f546b3f58a18858b56b871eb Author: Christian Lohmaier Date: Tue May 24 01:59:42 2016 +0200 gb_Dictionary_add_thesaurus doesn't like whitespace Change-Id: Ib8bd172570967b02fc21d01ea389d0b0b29c05ea diff --git a/Dictionary_en.mk b/Dictionary_en.mk index 7e96375..ce6354e 100644 --- a/Dictionary_en.mk +++ b/Dictionary_en.mk @@ -63,8 +63,6 @@ $(eval $(call gb_Dictionary_add_propertyfiles,dict-en,dialog,\ dictionaries/en/dialog/en_en_US.properties \ )) -$(eval $(call gb_Dictionary_add_thesaurus,dict-en,\ - dictionaries/en/th_en_US_v2.dat \ -)) +$(eval $(call gb_Dictionary_add_thesaurus,dict-en,dictionaries/en/th_en_US_v2.dat)) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fa9416906e615f5f19ad8524176d2ed693662769 Author: Christian Lohmaier Date: Tue May 24 01:59:42 2016 +0200 Updated core Project: dictionaries 697bbfa625583164f546b3f58a18858b56b871eb gb_Dictionary_add_thesaurus doesn't like whitespace Change-Id: Ib8bd172570967b02fc21d01ea389d0b0b29c05ea diff --git a/dictionaries b/dictionaries index 1f3eaa2..697bbfa 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 1f3eaa2dc7e2bc04fef06a0ed76ee18bb195e00f +Subproject commit 697bbfa625583164f546b3f58a18858b56b871eb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/opengl vcl/Package_opengl.mk
vcl/Package_opengl.mk |4 +
vcl/inc/opengl/program.hxx| 19 +++
vcl/opengl/combinedFragmentShader.glsl| 45
vcl/opengl/combinedTextureFragmentShader.glsl | 64
vcl/opengl/combinedTextureVertexShader.glsl | 32
vcl/opengl/combinedVertexShader.glsl | 47 +
vcl/opengl/gdiimpl.cxx| 69 --
vcl/opengl/program.cxx| 18 ++
8 files changed, 273 insertions(+), 25 deletions(-)
New commits:
commit 3cac38b2311538a0aecca765eb62c30c5098a85c
Author: Tomaž Vajngerl
Date: Fri May 20 14:59:24 2016 +0900
opengl: combined shaders to reduce shader switching
Combine most common shaders for non-texture drawing and texture
drawing into two combined shaders. Inside the shader we switch
between the code paths with if statements.
Using if statements (or any other branching statements) is
discouraged inside shaders but on the other hand we reduce program
state changes if we have less shader changes - which is more
important for us as we want to push more work to the GPU.
Change-Id: I6701b93faa9b0f55dd0af6d983ce4c2de4539c70
Reviewed-on: https://gerrit.libreoffice.org/25357
Reviewed-by: Tomaž Vajngerl
Tested-by: Tomaž Vajngerl
diff --git a/vcl/Package_opengl.mk b/vcl/Package_opengl.mk
index a0f6e9a..2fa917e 100644
--- a/vcl/Package_opengl.mk
+++ b/vcl/Package_opengl.mk
@@ -21,6 +21,10 @@ $(eval $(call
gb_Package_add_files,vcl_opengl_shader,$(LIBO_ETC_FOLDER)/opengl,\
invert50FragmentShader.glsl \
convolutionFragmentShader.glsl \
linearGradientFragmentShader.glsl \
+ combinedTextureFragmentShader.glsl \
+ combinedTextureVertexShader.glsl \
+ combinedFragmentShader.glsl \
+ combinedVertexShader.glsl \
lineFragmentShader.glsl \
lineVertexShader.glsl \
maskFragmentShader.glsl \
diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index 5944c72..2fab98c 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -27,6 +27,21 @@
typedef std::unordered_map< OString, GLuint, OStringHash > UniformCache;
typedef std::list< OpenGLTexture > TextureList;
+enum class TextureShaderType
+{
+Normal = 0,
+Blend,
+Masked,
+Diff,
+MaskedColor
+};
+
+enum class DrawShaderType
+{
+Normal = 0,
+Line
+};
+
class VCL_PLUGIN_PUBLIC OpenGLProgram
{
private:
@@ -78,6 +93,10 @@ public:
void SetTransform( const OString& rName, const OpenGLTexture& rTexture,
const basegfx::B2DPoint& rNull, const
basegfx::B2DPoint& rX,
const basegfx::B2DPoint& rY );
+void SetIdentityTransform(const OString& rName);
+void SetShaderType(TextureShaderType eTextureShaderType);
+void SetShaderType(DrawShaderType eDrawShaderType);
+
void SetBlendMode( GLenum nSFactor, GLenum nDFactor );
void ApplyMatrix(float fWidth, float fHeight, float fPixelOffset = 0.0f);
diff --git a/vcl/opengl/combinedFragmentShader.glsl
b/vcl/opengl/combinedFragmentShader.glsl
new file mode 100644
index 000..c44e75c
--- /dev/null
+++ b/vcl/opengl/combinedFragmentShader.glsl
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+varying float fade_factor; // 0->1 fade factor used for AA
+uniform vec4 color;
+
+uniform float line_width;
+uniform float feather;
+
+#define TYPE_NORMAL 0
+#define TYPE_LINE 1
+
+uniform int type;
+
+void main()
+{
+float alpha = 1.0;
+
+if (type == TYPE_LINE)
+{
+float start = (line_width / 2.0) - feather; // where we start to apply
alpha
+float end = (line_width / 2.0) + feather; // where we end to apply
alpha
+
+// Calculate the multiplier so we can transform the 0->1 fade factor
+// to take feather and line width into account.
+float multiplied = 1.0 / (1.0 - (start / end));
+
+float dist = (1.0 - abs(fade_factor)) * multiplied;
+
+alpha = clamp(dist, 0.0, 1.0);
+}
+
+vec4 result_color = color;
+result_color.a = result_color.a * alpha;
+
+gl_FragColor = result_color;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/opengl/combinedTextureFragmentShader.glsl
b/vcl/opengl/combinedTextureFragmentShader.glsl
new file mode 100644
index 000..d8864cf
--- /dev/null
+++ b/vcl/opengl/combinedTextureFragmentShader.glsl
@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffi
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/src
loleaflet/src/control/Control.ColumnHeader.js |1 +
loleaflet/src/control/Control.RowHeader.js|1 +
2 files changed, 2 insertions(+)
New commits:
commit 8ad50f62535c169c64e524ceb121ee837520d2cc
Author: Andras Timar
Date: Tue May 24 00:29:13 2016 +0200
loleaflet: add font styling to row/column context menus
(cherry picked from commit 3946ebd6e72870e5d1076f38b92c145e87093cbc)
diff --git a/loleaflet/src/control/Control.ColumnHeader.js
b/loleaflet/src/control/Control.ColumnHeader.js
index ba5caca..12dcdb6 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -28,6 +28,7 @@ L.Control.ColumnHeader = L.Control.extend({
var colHeaderObj = this;
$.contextMenu({
selector: '.spreadsheet-header-column',
+ className: 'loleaflet-font',
items: {
'insertcolbefore': {
name: _('Insert column before'),
diff --git a/loleaflet/src/control/Control.RowHeader.js
b/loleaflet/src/control/Control.RowHeader.js
index 091612d..a98e15c 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -26,6 +26,7 @@ L.Control.RowHeader = L.Control.extend({
var rowHeaderObj = this;
$.contextMenu({
selector: '.spreadsheet-header-row',
+ className: 'loleaflet-font',
items: {
'insertrowabove': {
name: _('Insert row above'),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.ColumnHeader.js |1 +
loleaflet/src/control/Control.RowHeader.js|1 +
2 files changed, 2 insertions(+)
New commits:
commit 3946ebd6e72870e5d1076f38b92c145e87093cbc
Author: Andras Timar
Date: Tue May 24 00:29:13 2016 +0200
loleaflet: add font styling to row/column context menus
diff --git a/loleaflet/src/control/Control.ColumnHeader.js
b/loleaflet/src/control/Control.ColumnHeader.js
index ba5caca..12dcdb6 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -28,6 +28,7 @@ L.Control.ColumnHeader = L.Control.extend({
var colHeaderObj = this;
$.contextMenu({
selector: '.spreadsheet-header-column',
+ className: 'loleaflet-font',
items: {
'insertcolbefore': {
name: _('Insert column before'),
diff --git a/loleaflet/src/control/Control.RowHeader.js
b/loleaflet/src/control/Control.RowHeader.js
index 091612d..a98e15c 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -26,6 +26,7 @@ L.Control.RowHeader = L.Control.extend({
var rowHeaderObj = this;
$.contextMenu({
selector: '.spreadsheet-header-row',
+ className: 'loleaflet-font',
items: {
'insertrowabove': {
name: _('Insert row above'),
___
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-1-0' - loleaflet/dist
loleaflet/dist/loleaflet.html |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2552a214df97df8a3a4f22cfbba6bed11ccfbc06
Author: Andras Timar
Date: Tue May 24 00:17:44 2016 +0200
loleaflet: define l10n _() function earlier
(cherry picked from commit ec6e6269527a61960517f7cb7a33e79f8c174866)
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index c27cb69..c83f869 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -34,6 +34,7 @@
https://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js";>
+var _ = function (string) {return
string.toLocaleString();};
https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/jquery-ui.min.js";>
@@ -48,7 +49,6 @@
vex.defaultOptions.className = 'vex-theme-plain';
-var _ = function (string) {return
string.toLocaleString();};
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/loleaflet.html |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ec6e6269527a61960517f7cb7a33e79f8c174866
Author: Andras Timar
Date: Tue May 24 00:17:44 2016 +0200
loleaflet: define l10n _() function earlier
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index c27cb69..c83f869 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -34,6 +34,7 @@
https://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js";>
+var _ = function (string) {return
string.toLocaleString();};
https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/jquery-ui.min.js";>
@@ -48,7 +49,6 @@
vex.defaultOptions.className = 'vex-theme-plain';
-var _ = function (string) {return
string.toLocaleString();};
[Libreoffice-commits] online.git: 2 commits - loleaflet/dist loleaflet/.gitignore
loleaflet/.gitignore|2 +-
loleaflet/dist/errormessages.js |2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 58c65fbca492edafbf3ce04c54b5c159713a0d2d
Author: Andras Timar
Date: Mon May 23 23:53:32 2016 +0200
loleaflet: add dist/errormessages.js
diff --git a/loleaflet/dist/errormessages.js b/loleaflet/dist/errormessages.js
new file mode 100644
index 000..6fa628b
--- /dev/null
+++ b/loleaflet/dist/errormessages.js
@@ -0,0 +1,2 @@
+var wrongwopisrc = _('Wrong WOPISrc, usage: WOPISrc=valid encoded URI, or
file_path, usage: file_path=/path/to/doc/');
+var emptyhosturl = _('The host URL is empty. The loolwsd server is probably
misconfigured, please contact the administrator.');
commit 240ce7e8e9198d0355cb96699847faf1100cf6af
Author: Andras Timar
Date: Mon May 23 23:53:08 2016 +0200
loleaflet: don't ignore errormessages.js
diff --git a/loleaflet/.gitignore b/loleaflet/.gitignore
index 5b195c2..edf8521 100644
--- a/loleaflet/.gitignore
+++ b/loleaflet/.gitignore
@@ -11,7 +11,7 @@ component.json
_site
dist/*.js
dist/branding.css
-dist/branding.js
+!dist/errormessages.js
dist/images/toolbar-bg.png
dist/admin/*.js
dist/plugins/
___
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-1-0' - 2 commits - loleaflet/dist loleaflet/.gitignore
loleaflet/.gitignore|2 +-
loleaflet/dist/errormessages.js |2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit dbc729a59598a4b7fee3746d8e3934fecfc99070
Author: Andras Timar
Date: Mon May 23 23:53:32 2016 +0200
loleaflet: add dist/errormessages.js
(cherry picked from commit 58c65fbca492edafbf3ce04c54b5c159713a0d2d)
diff --git a/loleaflet/dist/errormessages.js b/loleaflet/dist/errormessages.js
new file mode 100644
index 000..6fa628b
--- /dev/null
+++ b/loleaflet/dist/errormessages.js
@@ -0,0 +1,2 @@
+var wrongwopisrc = _('Wrong WOPISrc, usage: WOPISrc=valid encoded URI, or
file_path, usage: file_path=/path/to/doc/');
+var emptyhosturl = _('The host URL is empty. The loolwsd server is probably
misconfigured, please contact the administrator.');
commit 6b1d8d9cb313ed696652cbc6d5ec3e5b90005777
Author: Andras Timar
Date: Mon May 23 23:53:08 2016 +0200
loleaflet: don't ignore errormessages.js
(cherry picked from commit 240ce7e8e9198d0355cb96699847faf1100cf6af)
diff --git a/loleaflet/.gitignore b/loleaflet/.gitignore
index 5b195c2..edf8521 100644
--- a/loleaflet/.gitignore
+++ b/loleaflet/.gitignore
@@ -11,7 +11,7 @@ component.json
_site
dist/*.js
dist/branding.css
-dist/branding.js
+!dist/errormessages.js
dist/images/toolbar-bg.png
dist/admin/*.js
dist/plugins/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes21' - 2 commits -
0 files changed New commits: commit c6646645d4f43609bb280d387121b0b0f23bf1f5 Author: László Németh Date: Mon May 23 23:33:32 2016 +0200 empty commit (repeat) Change-Id: Id07b661fd99309d65b0787acf1e3c55cab4708c7 commit 31975055f96b6cf9e527fcd39bb216c44017d674 Author: László Németh Date: Mon May 23 23:33:14 2016 +0200 empty commit (repeat) Change-Id: I3814dc0bde2b28c89b2239f6822fb1b80fc18247 ___ 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-1-0' - 4 commits - loleaflet/dist loleaflet/Makefile loleaflet/src
loleaflet/Makefile |2
loleaflet/dist/loleaflet.html|5
loleaflet/dist/toolbar/toolbar.js| 13 --
loleaflet/src/control/Control.ContextMenu.js |1
loleaflet/src/control/Control.Menubar.js | 172 +--
5 files changed, 92 insertions(+), 101 deletions(-)
New commits:
commit 63a52dbd172da0d16e1e412af6274a88d837e6fe
Author: Andras Timar
Date: Mon May 23 23:31:37 2016 +0200
loleaflet: bccu#1813 workaround for double encoding in cp-5.0 branch
(cherry picked from commit 3724fc1b668961b729f47095dd9403c6e38c0728)
diff --git a/loleaflet/src/control/Control.ContextMenu.js
b/loleaflet/src/control/Control.ContextMenu.js
index 50781da..cdec3b2 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -105,6 +105,7 @@ L.Control.ContextMenu = L.Control.extend({
}
itemName = item.text.replace('~', '');
+ itemName = itemName.replace('ð', '°'); //
bccu#1813 double encoding in cp-5.0 branch only
contextMenu[item.command] = {
name: _(itemName)
};
commit 15e5ab7c413b75e90dbe9ff69f50969dd8fb236e
Author: Andras Timar
Date: Mon May 23 22:49:11 2016 +0200
loleaflet: enable l10n of menus
(cherry picked from commit 62896c66eadd36d0ae01bb05a8911c294562e0c3)
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 91c55f6..b42cc4e 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -33,6 +33,7 @@ pot:
dist/errormessages.js \
dist/toolbar/toolbar.js \
src/control/Control.Tabs.js \
+ src/control/Control.Menubar.js \
src/core/Socket.js
html2po --pot --input=dist/loleaflet-help.html
--output=po/loleaflet-help.pot
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 2e6da81..d89c05e 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -6,127 +6,127 @@
L.Control.Menubar = L.Control.extend({
options: {
text: [
- {name: 'File', type: 'menu', menu: [{name: 'Save',
type: 'unocommand', uno: '.uno:Save'},
-
{name: 'Print', id: 'print', type: 'action'},
-
{name: 'Download as', type: 'menu', menu: [{name: 'PDF Document
(.pdf)', id: 'downloadas-pdf', type: 'action'},
-
{name: 'ODF text document (.odt)', id: 'downloadas-odt',
type: 'action'},
-
{name: 'Microsoft Word 2003 (.doc)', id: 'downloadas-doc',
type: 'action'},
-
{name: 'Microsoft Word (.docx)', id: 'downloadas-docx',
type: 'action'}]}]
+ {name: _('File'), type: 'menu', menu: [{name:
_('Save'), type: 'unocommand', uno: '.uno:Save'},
+
{name: _('Print'), id: 'print', type: 'action'},
+
{name: _('Download as'), type: 'menu', menu: [{name: _('PDF
Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
+
{name: _('ODF text document (.odt)'), id: 'downloadas-odt',
type: 'action'},
+
{name: _('Microsoft Word 2003 (.doc)'), id:
'downloadas-doc', type: 'action'},
+
{name: _('Microsoft Word (.docx)'), id: 'downloadas-docx',
type: 'action'}]}]
},
- {name: 'Edit', type: 'menu', menu: [{name: 'Undo',
type: 'unocommand', uno: '.uno:Undo'},
-
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.ContextMenu.js |1 +
1 file changed, 1 insertion(+)
New commits:
commit 3724fc1b668961b729f47095dd9403c6e38c0728
Author: Andras Timar
Date: Mon May 23 23:31:37 2016 +0200
loleaflet: bccu#1813 workaround for double encoding in cp-5.0 branch
diff --git a/loleaflet/src/control/Control.ContextMenu.js
b/loleaflet/src/control/Control.ContextMenu.js
index 50781da..cdec3b2 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -105,6 +105,7 @@ L.Control.ContextMenu = L.Control.extend({
}
itemName = item.text.replace('~', '');
+ itemName = itemName.replace('ð', '°'); //
bccu#1813 double encoding in cp-5.0 branch only
contextMenu[item.command] = {
name: _(itemName)
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ac06e4ef9d56677e1469e94b99045b3e02c7511f Author: Christian Lohmaier Date: Mon May 23 23:23:02 2016 +0200 Updated core Project: dictionaries 1f3eaa2dc7e2bc04fef06a0ed76ee18bb195e00f thesuaurs.idx is generated by gb_Dictionary_add_thesaurus as there is only one thesuarus, no need for the thesauri variant that does nothing else but call the thesuarus one.. Change-Id: Ia366e13e9cee0f15d282377124404a4cf0c3039b diff --git a/dictionaries b/dictionaries index 2f0ddae..1f3eaa2 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 2f0ddaeeb4323ac99afd35d2c4fda643c9ee8bcf +Subproject commit 1f3eaa2dc7e2bc04fef06a0ed76ee18bb195e00f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Dictionary_en.mk en/th_en_US_v2.idx
Dictionary_en.mk |3 en/th_en_US_v2.idx |145868 - 2 files changed, 1 insertion(+), 145870 deletions(-) New commits: commit 1f3eaa2dc7e2bc04fef06a0ed76ee18bb195e00f Author: Christian Lohmaier Date: Mon May 23 23:23:02 2016 +0200 thesuaurs.idx is generated by gb_Dictionary_add_thesaurus as there is only one thesuarus, no need for the thesauri variant that does nothing else but call the thesuarus one.. Change-Id: Ia366e13e9cee0f15d282377124404a4cf0c3039b diff --git a/Dictionary_en.mk b/Dictionary_en.mk index 04b28e8..7e96375 100644 --- a/Dictionary_en.mk +++ b/Dictionary_en.mk @@ -63,9 +63,8 @@ $(eval $(call gb_Dictionary_add_propertyfiles,dict-en,dialog,\ dictionaries/en/dialog/en_en_US.properties \ )) -$(eval $(call gb_Dictionary_add_thesauri,dict-en,\ +$(eval $(call gb_Dictionary_add_thesaurus,dict-en,\ dictionaries/en/th_en_US_v2.dat \ - dictionaries/en/th_en_US_v2.idx \ )) # vim: set noet sw=4 ts=4: diff --git a/en/th_en_US_v2.idx b/en/th_en_US_v2.idx deleted file mode 100755 index 25e84cb..000 --- a/en/th_en_US_v2.idx +++ /dev/null @@ -1,145868 +0,0 @@ -UTF-8 -145866 -'s gravenhage|7 -'tween decks|139 -.22|176 -.22-calibre|271 -.22 caliber|358 -.22 calibre|445 -.38-caliber|532 -.38-calibre|619 -.38 caliber|706 -.38 calibre|793 -.45-caliber|880 -.45-calibre|967 -.45 caliber|1054 -.45 calibre|1141 -0|1228 -1|1346 -1-dodecanol|1466 -1-hitter|1527 -10|1611 -10-membered|1711 -100|1770 -1000|1899 -1|2053 -10|2119 -100|2188 -10|2270 -1|2350 -1000th|2498 -100th|2549 -101|2609 -101st|2682 -105|2739 -105th|2797 -10th|2854 -11|2898 -11-plus|2992 -110|3073 -110th|3130 -115|3187 -115th|3249 -11 november|3310 -11th|3398 -12|3445 -12-tone music|3553 -12-tone system|3683 -120|3813 -120th|3938 -125|3999 -125th|4066 -12th|4130 -13|4176 -130|4303 -130th|4365 -135|4426 -135th|4494 -13th|4558 -14|4607 -140|4707 -140th|4767 -144|4827 -145|4877 -145th|4943 -14 july|5006 -14th|5137 -15|5186 -150|5282 -150th|5341 -1530s|5401 -155|5490 -155th| -15 august 1945|5618 -15 may organization|5715 -15 minutes|5900 -15th|5988 -16|6036 -160|6134 -160th|6194 -165|6254 -165th|6320 -16 pf|6383 -16th|6533 -17|6581 -170|6685 -170th|6748 -1728|6810 -175|6867 -1750s|6936 -175th|7025 -1760s|7090 -1770s|7179 -1780s|7268 -1790s|7357 -17 november|7446 -17th|7654 -18|7704 -18-karat gold|7808 -180|7875 -180th|7938 -1820s|7999 -1830s|8088 -1840s|8177 -1850s|8266 -1860s|8355 -1870s|8444 -1880s|8533 -1890s|8631 -18th|8729 -19|8778 -190|8878 -1900s|8939 -190th|9028 -1920s|9089 -1930s|9187 -1940s|9285 -1950s|9382 -1960s|9479 -1970s|9576 -1980s|9675 -1990s|9773 -19th|9871 -1 chronicles|9920 -1 esdras|9990 -1 kings|10047 -1 maccabees|10102 -1 samuel|10169 -1st|10227 -1st-class mail|10270 -1st baron beaverbrook|10355 -1st baron verulam|10606 -1st class|10829 -1st earl attlee|10914 -1st earl baldwin of bewdley|11079 -1st earl of balfour|11247 -1st viscount montgomery of alamein|11404 -2|11597 -2-dimensional|11704 -2-hitter|11781 -2-hydroxybenzoic acid|11865 -2-methylpropenoic acid|11941 -20|12012 -200|12106 -200th|12159 -20th|12212 -21|12260 -21st|12364 -22|12415 -22-karat gold|12521 -22nd|12588 -23|12640 -23rd|12752 -24|12803 -24-hour interval|12921 -24-karat gold|13073 -24/7|13178 -24th|13216 -25|13268 -25th|13374 -26|13425 -26th|13531 -27|13582 -27th|13694 -28|13747 -28th|13861 -29|13913 -29th|14021 -2 chronicles|14072 -2 esdras|14143 -2 kings|14202 -2 maccabees|14258 -2 samuel|14326 -2d|14385 -2nd|14432 -3|14479 -3-d|14696 -3-dimensional|15037 -3-hitter|15137 -3-membered|15223 -30|15283 -300|15379 -300th|15435 -30 minutes|15490 -30th|15575 -31|15623 -31st|15676 -32|15727 -32nd|15781 -33|15833 -33rd|15890 -34|15941 -34th|15996 -35|16048 -35th|16102 -36|16153 -365 days|16207 -366 days|16304 -36th|16432 -37|16483 -37th|16540 -38|16593 -38th|16651 -39|16703 -39th|16756 -3d|16807 -3d radar|17147 -3rd|17315 -3rd october organization|17367 -3tc|17630 -4|17738 -4-dimensional|17928 -4-hitter|18001 -4-membered|18086 -40|18145 -400|18246 -400th|18300 -401-k|18354 -401-k plan|18621 -40th|1 -41|18935 -41st|18986 -42|19036 -42nd|19088 -43|19139 -43rd|19194 -44|19244 -440 yards|19297 -44th|19358 -45|19409 -45th|19461 -46|19511 -46th|19563 -47|19613 -47th|19668 -48|19720 -48th|19776 -49|19827 -49th|19878 -4th|19928 -4to|19983 -4wd|20025 -5|20216 -5-hitter|20390 -5-hydroxy-3-methylglutaryl-coenzyme a reductase|20475 -5-hydroxytryptamine|20625 -5-membered|20708 -50|20767 -500|20857 -500th|20962 -50th|21016 -51|21063 -52|21113 -53|21164 -54|21218 -55|21270 -55th|21321 -56|21371 -57|21422 -58|21476 -59|21531 -5th|21583 -6|21626 -6-membered|21817 -60|21875 -60 minutes|21978 -60th|22061 -61|22108 -62|22159 -63|22211 -64|22266 -64th|22319 -65|22370 -65th|22422 -66|22472 -67|22524 -68|22579 -69|22635 -6 june 1944|22688 -6th|22781 -7|22824 -7-membered|22963 -70|23023 -70th|23121 -71|23170 -72|23224 -73|23279 -74|2333
[Libreoffice-commits] core.git: 3 commits - bin/symbolstore.py bin/upload_symbols.py Makefile.in
Makefile.in |3 +++
bin/symbolstore.py|2 +-
bin/upload_symbols.py |4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit c64119e4f49e74773ad0826f10ebfbe8dd27d2bd
Author: Markus Mohrhard
Date: Mon May 23 22:59:57 2016 +0200
fix the crash report location also in another place
Change-Id: I3ab133fbdcdcc8a17ec9159d1c88b19f35b6a7b0
diff --git a/bin/upload_symbols.py b/bin/upload_symbols.py
index 8d99ab9..483ac3b 100644
--- a/bin/upload_symbols.py
+++ b/bin/upload_symbols.py
@@ -12,8 +12,8 @@ def main():
print("Invalid number of parameters")
sys.exit(1)
-url = "http://localhost:8000/upload/";
-files = {'symbols': open(sys.argv[1], 'rb'), 'comment':sys.argv[2]}
+url = "http://vm171.documentfoundation.org/upload/";
+files = {'symbols': open(sys.argv[1], 'rb'), 'comment': sys.argv[2]}
comment = {'comment': sys.argv[2]}
r = requests.post(url, files = files, data = {"comment":"whatever",
"tempt":"tempt"})
print(r)
commit c7c86b4b3d3ebf323e1c3f13e9e2dff8be61d17d
Author: Markus Mohrhard
Date: Mon May 23 22:57:56 2016 +0200
add a build system target to generate the symbol files
Change-Id: Ib690eb05deaec5d8ce91f6b76daadf427d7ad964
diff --git a/Makefile.in b/Makefile.in
index d0c5757..26f9e0e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -380,6 +380,9 @@ findunusedcode:
findunusedheaders:
$(SRCDIR)/bin/find-unusedheaders.pl
+symbols:
+ mkdir -p $(WORKDIR)/symbols/
+ $(SRCDIR)/bin/symbolstore.py
$(WORKDIR)/UnpackedTarball/breakpad/src/tools/linux/dump_syms/dump_syms
$(WORKDIR)/symbols/ $(INSTDIR)/program/*
dump-deps:
@$(SRCDIR)/bin/module-deps.pl $(MAKE) $(SRCDIR)/Makefile.gbuild
commit 3f825963973814530752e451fc7155fc054923bd
Author: Markus Mohrhard
Date: Mon May 23 22:46:28 2016 +0200
also handle .bin files in the windows symbol code
Change-Id: I85b0490c515987d56e04d0e5b42111c52bbabbc3
diff --git a/bin/symbolstore.py b/bin/symbolstore.py
index 941f448..823be62 100755
--- a/bin/symbolstore.py
+++ b/bin/symbolstore.py
@@ -485,7 +485,7 @@ class Dumper_Win32(Dumper):
or exe files with the same base name next to them."""
if file.endswith(".pdb"):
(path,ext) = os.path.splitext(file)
-if os.path.isfile(path + ".exe") or os.path.isfile(path + ".dll"):
+if os.path.isfile(path + ".exe") or os.path.isfile(path + ".dll")
or os.path.isfile(path + ".bin"):
return True
return False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/Makefile loleaflet/src
loleaflet/Makefile |1
loleaflet/src/control/Control.Menubar.js | 172 +++
2 files changed, 87 insertions(+), 86 deletions(-)
New commits:
commit 62896c66eadd36d0ae01bb05a8911c294562e0c3
Author: Andras Timar
Date: Mon May 23 22:49:11 2016 +0200
loleaflet: enable l10n of menus
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 5cff678..22206fa 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -33,6 +33,7 @@ pot:
dist/errormessages.js \
dist/toolbar/toolbar.js \
src/control/Control.Tabs.js \
+ src/control/Control.Menubar.js \
src/core/Socket.js
html2po --pot --input=dist/loleaflet-help.html
--output=po/loleaflet-help.pot
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 2e6da81..d89c05e 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -6,127 +6,127 @@
L.Control.Menubar = L.Control.extend({
options: {
text: [
- {name: 'File', type: 'menu', menu: [{name: 'Save',
type: 'unocommand', uno: '.uno:Save'},
-
{name: 'Print', id: 'print', type: 'action'},
-
{name: 'Download as', type: 'menu', menu: [{name: 'PDF Document
(.pdf)', id: 'downloadas-pdf', type: 'action'},
-
{name: 'ODF text document (.odt)', id: 'downloadas-odt',
type: 'action'},
-
{name: 'Microsoft Word 2003 (.doc)', id: 'downloadas-doc',
type: 'action'},
-
{name: 'Microsoft Word (.docx)', id: 'downloadas-docx',
type: 'action'}]}]
+ {name: _('File'), type: 'menu', menu: [{name:
_('Save'), type: 'unocommand', uno: '.uno:Save'},
+
{name: _('Print'), id: 'print', type: 'action'},
+
{name: _('Download as'), type: 'menu', menu: [{name: _('PDF
Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
+
{name: _('ODF text document (.odt)'), id: 'downloadas-odt',
type: 'action'},
+
{name: _('Microsoft Word 2003 (.doc)'), id:
'downloadas-doc', type: 'action'},
+
{name: _('Microsoft Word (.docx)'), id: 'downloadas-docx',
type: 'action'}]}]
},
- {name: 'Edit', type: 'menu', menu: [{name: 'Undo',
type: 'unocommand', uno: '.uno:Undo'},
-
{name: 'Redo', type: 'unocommand', uno: '.uno:Redo'},
+ {name: _('Edit'), type: 'menu', menu: [{name:
_('Undo'), type: 'unocommand', uno: '.uno:Undo'},
+
{name: _('Redo'), type: 'unocommand', uno: '.uno:Redo'},
{type: 'separator'},
-
{name: 'Cut', type: 'unocommand', uno: '.uno:Cut'},
-
{name: 'Copy', type: 'unocommand', uno: '.uno:Copy'},
-
{name: 'Paste', type: 'unocommand', uno: '.uno:Paste'},
+
{name: _('Cut'), type: 'unocommand', uno: '.uno:Cut'},
+
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/toolbar/toolbar.js | 13 -
1 file changed, 13 deletions(-)
New commits:
commit c90bd39b2ebe2e03965e9d47afc0b6a042587cb2
Author: Andras Timar
Date: Mon May 23 22:40:30 2016 +0200
loleaflet: remove obsoleted dialog for menu:file:saveas
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index ad13560..81aeb91 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -226,19 +226,6 @@ function onClick(id) {
map.setPart(id);
}
}
- else if (id === 'menu:file:saveas') {
- var dialog = 'URL' +
- '' +
- 'Format' +
- '' +
- 'Options' +
- '';
- vex.dialog.open({
- message: 'Save as:',
- input: dialog,
- callback: onSaveAs
- });
- }
else if (id === 'takeedit') {
if (!item.checked) {
map._socket.sendMessage('takeedit');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist loleaflet/Makefile
loleaflet/Makefile|1 +
loleaflet/dist/loleaflet.html |5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 55c77c6deb16c694c50a70c98ea0110eae3d5159
Author: Andras Timar
Date: Mon May 23 22:32:56 2016 +0200
loleaflet: enable l10n of two error messages
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index f7b575e..5cff678 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -30,6 +30,7 @@ dist: all
pot:
xgettext --from-code=UTF-8 --keyword=_ --output=po/loleaflet-ui.pot \
+ dist/errormessages.js \
dist/toolbar/toolbar.js \
src/control/Control.Tabs.js \
src/core/Socket.js
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index a8eac6b..c27cb69 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -49,6 +49,7 @@
vex.defaultOptions.className = 'vex-theme-plain';
var _ = function (string) {return
string.toLocaleString();};
+
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/inc/cuitabarea.hxx | 11 -
cui/source/tabpages/tparea.cxx | 136 +--
cui/source/tabpages/tphatch.cxx | 110
cui/uiconfig/ui/areatabpage.ui | 78 ---
cui/uiconfig/ui/hatchpage.ui| 274 +---
5 files changed, 274 insertions(+), 335 deletions(-)
New commits:
commit 7a4bd998e900c7f7a28f9068b97707ef76c99b85
Author: Rishabh Kumar
Date: Thu May 19 13:54:04 2016 +0530
Addition of new controls and their rearrangement in hatch tab
1. Removal of rectangle hatch angle dial widget
2. Addition of slider widget for changing angle in hatch tab.
3. Move hatch background color control from area tab to hatch tab.
4. Rearrangement of controls
5. Removal of hatch controls from Area tab
Change-Id: I596098b328fc183d2fdd5259e90013dbf74d9ad7
Reviewed-on: https://gerrit.libreoffice.org/25147
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index c8235fe..79d1f33 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -193,10 +193,6 @@ private:
VclPtr m_pLbBitmap;
VclPtrm_pCtlBitmapPreview;
-VclPtr m_pFlHatchBckgrd;
-VclPtr m_pCbxHatchBckgrd;
-VclPtrm_pLbHatchBckgrdColor;
-
VclPtr m_pBxBitmap;
VclPtr m_pFlSize;
@@ -264,10 +260,8 @@ private:
DECL_LINK_TYPED(SelectDialogTypeHdl_Impl, ListBox&, void);
DECL_LINK_TYPED( ModifyColorHdl_Impl, ListBox&, void );
-DECL_LINK_TYPED( ModifyHatchBckgrdColorHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ModifyGradientHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ModifyHatchingHdl_Impl, ListBox&, void );
-DECL_LINK_TYPED( ToggleHatchBckgrdColorHdl_Impl, CheckBox&, void );
DECL_LINK_TYPED( ModifyBitmapHdl_Impl, ListBox&, void );
void ModifyStepCountHdl_Impl(void*);
@@ -473,9 +467,10 @@ class SvxHatchTabPage : public SvxTabPage
private:
VclPtrm_pMtrDistance;
VclPtrm_pMtrAngle;
-VclPtr m_pCtlAngle;
+VclPtr m_pSliderAngle;
VclPtrm_pLbLineType;
VclPtrm_pLbLineColor;
+VclPtrm_pLbBackgroundColor;
VclPtr m_pLbHatchings;
VclPtrm_pCtlPreview;
VclPtr m_pBtnAdd;
@@ -506,6 +501,8 @@ private:
DECL_LINK_TYPED( ChangeHatchHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ModifiedEditHdl_Impl, Edit&, void );
DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void );
+DECL_LINK_TYPED( ModifiedBackgroundHdl_Impl, ListBox&, void );
+DECL_LINK_TYPED( ModifiedSliderHdl_Impl, Slider*, void );
void ModifiedHdl_Impl(void*);
DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void );
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 4b0faa3..29b3470 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -115,10 +115,6 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent,
const SfxItemSet& rInAttrs
get(m_pLbBitmap,"LB_BITMAP");
get(m_pCtlBitmapPreview,"CTL_BITMAP_PREVIEW");
-get(m_pFlHatchBckgrd,"FL_HATCHCOLORS");
-get(m_pLbHatchBckgrdColor,"LB_HATCHBCKGRDCOLOR");
-get(m_pCbxHatchBckgrd,"CB_HATCHBCKGRD");
-
get(m_pBxBitmap,"boxBITMAP");
get(m_pFlSize,"FL_SIZE");
@@ -151,11 +147,8 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent,
const SfxItemSet& rInAttrs
//size required for any of the areas which might be selected
//later, so that there's sufficient space
VclContainer *pMainFrame = get("mainframe");
-Size aHatchSize(m_pFlHatchBckgrd->get_preferred_size());
Size aBitmapSize(m_pBxBitmap->get_preferred_size());
-Size aMainFrame(
-std::max(aHatchSize.Width(), aBitmapSize.Width()),
-std::max(aHatchSize.Height(), aBitmapSize.Height()));
+Size aMainFrame(aBitmapSize.Width(),aBitmapSize.Height());
pMainFrame->set_width_request(aMainFrame.Width());
pMainFrame->set_height_request(aMainFrame.Height());
@@ -166,9 +159,6 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const
SfxItemSet& rInAttrs
m_pBxBitmap->Hide();
-// Controls for Hatch-Background
-m_pFlHatchBckgrd->Hide();
-
m_pTsbOriginal->EnableTriState( false );
// this page needs ExchangeSupport
@@ -200,8 +190,6 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const
SfxItemSet& rInAttrs
m_pCtlBitmapPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
m_pLbColor->SetSelectHdl( LINK( this, SvxAreaTabPage, ModifyColorHdl_Impl
) );
-m_pLbHatchBckgrdColor->SetSelectHdl( LINK( this, SvxAreaTabPage,
ModifyHatchBckgrdColorHdl_Impl ) );
-m_pCbxHatchBckgrd->SetToggleHdl( LINK( this, SvxAreaTabPage,
ToggleHatchBckgrdColorHdl_Impl ) );
/
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/floatwin.hxx |1 +
vcl/source/window/floatwin.cxx |7 ---
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit d1182223dcd3aca6b0922f1b27bc1537bceca7ae
Author: Caolán McNamara
Date: Mon May 23 20:48:57 2016 +0100
like menus do, restore focus to prev control when floatingwindow popdowns
in the FloatWinPopupFlags::GrabFocus case
Change-Id: Ibebf23c83133f74f00e5dbb2540f108a383462cc
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 92ca793..d22602d 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -91,6 +91,7 @@ class VCL_DLLPUBLIC FloatingWindow : public SystemWindow
private:
VclPtr mpNextFloat;
VclPtr mpFirstPopupModeWin;
+VclPtr mxPrevFocusWin;
ImplData* mpImplData;
Rectangle maFloatRect;
ImplSVEvent * mnPostId;
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 024d726..82283c9 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -634,7 +634,7 @@ void FloatingWindow::ImplCallPopupModeEnd()
// call Handler asynchronously.
if ( mpImplData && !mnPostId )
-mnPostId = Application::PostUserEvent( LINK( this, FloatingWindow,
ImplEndPopupModeHdl ), nullptr, true );
+mnPostId = Application::PostUserEvent( LINK( this, FloatingWindow,
ImplEndPopupModeHdl ), mxPrevFocusWin, true );
}
void FloatingWindow::PopupModeEnd()
@@ -711,10 +711,11 @@ void FloatingWindow::StartPopupMode( const Rectangle&
rRect, FloatWinPopupFlags
ImplSVData* pSVData = ImplGetSVData();
mpNextFloat = pSVData->maWinData.mpFirstFloat;
pSVData->maWinData.mpFirstFloat = this;
-if( nFlags & FloatWinPopupFlags::GrabFocus )
+if (nFlags & FloatWinPopupFlags::GrabFocus)
{
// force key input even without focus (useful for menus)
mbGrabFocus = true;
+mxPrevFocusWin = Window::SaveFocus();
mpWindowImpl->mpFrameData->mbHasFocus = true;
GrabFocus();
}
@@ -840,7 +841,7 @@ void FloatingWindow::ImplEndPopupMode(
FloatWinPopupEndFlags nFlags, const VclPt
void FloatingWindow::EndPopupMode( FloatWinPopupEndFlags nFlags )
{
-ImplEndPopupMode( nFlags );
+ImplEndPopupMode(nFlags, mxPrevFocusWin);
}
void FloatingWindow::AddPopupModeWindow( vcl::Window* pWindow )
___
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/solver.xhp |2 +- source/text/swriter/01/04120250.xhp |4 ++-- source/text/swriter/main0208.xhp|2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit f2361eb91e2e47b0ecbc02bedb8763c08007f0c4 Author: Christian Lohmaier Date: Mon May 23 22:05:06 2016 +0200 remove spurious space before Change-Id: Icf4d5ba12ab65bbedaf75bdee4ffc36131ea731e diff --git a/source/text/scalc/01/solver.xhp b/source/text/scalc/01/solver.xhp index 0c79471..bb79ce7 100644 --- a/source/text/scalc/01/solver.xhp +++ b/source/text/scalc/01/solver.xhp @@ -98,7 +98,7 @@ I hate such spec docs that leave so many questionsTo solve equations with the solver The goal of the solver process is to find those variable values of an equation that result in an optimized value in the target cell, also named the "objective". You can choose whether the value in the target cell should be a maximum, a minimum, or approaching a given value. -The initial variable values are inserted in a rectangular cell range that you enter in the By changing cells box. +The initial variable values are inserted in a rectangular cell range that you enter in the By changing cells box. You can define a series of limiting conditions that set constraints for some cells. For example, you can set the constraint that one of the variables or cells must not be bigger than another variable, or not bigger than a given value. You can also define the constraint that one or more variables must be integers (values without decimals), or binary values (where only 0 and 1 are allowed). The default solver engine supports only linear equations.Add an example. A good one is at http://www.solver.com/stepbystep.htm but that is not OpenSource diff --git a/source/text/swriter/01/04120250.xhp b/source/text/swriter/01/04120250.xhp index b464ad2..816411c 100644 --- a/source/text/swriter/01/04120250.xhp +++ b/source/text/swriter/01/04120250.xhp @@ -54,7 +54,7 @@ Click the File button, and then choose New or Edit. -A concordance file contains the following fields: +A concordance file contains the following fields: "Search term" refers to the index entry that you want to mark in the document. "Alternative entry" refers to the index entry that you want to appear in the index. The 1st and 2nd Keys are parent index entries. The "Search term" or the "Alternative entry" appears as a subentry under the 1st and 2nd Keys. @@ -83,7 +83,7 @@ Boston;Boston;Cities;;0;0 UFI: translate this with same name as in par_id3155907. Pay attention to the following paras also This also finds "Boston" if it is written in lowercase letters. To include the "Beacon Hill" district in Boston under the "Cities" entry, enter the following line: -Beacon Hill;Boston;Cities; +Beacon Hill;Boston;Cities; \ No newline at end of file diff --git a/source/text/swriter/main0208.xhp b/source/text/swriter/main0208.xhp index afad907..8d3a784 100644 --- a/source/text/swriter/main0208.xhp +++ b/source/text/swriter/main0208.xhp @@ -31,7 +31,7 @@ Status Bar -The Status Bar contains information about the current document and offers various buttons with special functions. +The Status Bar contains information about the current document and offers various buttons with special functions. ___ 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 015456844faa8bfc848e3ed933d694c3a2fd8fbf Author: Christian Lohmaier Date: Mon May 23 22:05:06 2016 +0200 Updated core Project: help f2361eb91e2e47b0ecbc02bedb8763c08007f0c4 remove spurious space before Change-Id: Icf4d5ba12ab65bbedaf75bdee4ffc36131ea731e diff --git a/helpcontent2 b/helpcontent2 index caeff7f..f2361eb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit caeff7f2fb309f76e5a74cab62016bf2d185840a +Subproject commit f2361eb91e2e47b0ecbc02bedb8763c08007f0c4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: 2 commits - source/text
source/text/scalc/01/solver.xhp |2 +- source/text/shared/01/ref_pdf_export.xhp |4 ++-- source/text/shared/01/ref_pdf_send_as.xhp |2 +- source/text/shared/guide/error_report.xhp |2 +- source/text/simpress/01/0608.xhp |2 +- 5 files changed, 6 insertions(+), 6 deletions(-) New commits: commit caeff7f2fb309f76e5a74cab62016bf2d185840a Author: Christian Lohmaier Date: Mon May 23 21:57:51 2016 +0200 remove spurious space before Change-Id: I06d328b73455d5b6ea04d7c04c9b09fcb7bad366 diff --git a/source/text/scalc/01/solver.xhp b/source/text/scalc/01/solver.xhp index c2ff004..0c79471 100644 --- a/source/text/scalc/01/solver.xhp +++ b/source/text/scalc/01/solver.xhp @@ -39,7 +39,7 @@ -Solver +Solver Opens the Solver dialog. A solver allows you to solve equations with multiple unknown variables by goal-seeking methods. diff --git a/source/text/shared/01/ref_pdf_export.xhp b/source/text/shared/01/ref_pdf_export.xhp index a1d9546..b5458b6 100644 --- a/source/text/shared/01/ref_pdf_export.xhp +++ b/source/text/shared/01/ref_pdf_export.xhp @@ -39,7 +39,7 @@ Export as PDF -Saves the current file to Portable Document Format (PDF) version 1.4. A PDF file can be viewed and printed on any platform with the original formatting intact, provided that supporting software is installed. +Saves the current file to Portable Document Format (PDF) version 1.4. A PDF file can be viewed and printed on any platform with the original formatting intact, provided that supporting software is installed. diff --git a/source/text/shared/guide/error_report.xhp b/source/text/shared/guide/error_report.xhp index 6d04205..db71905 100644 --- a/source/text/shared/guide/error_report.xhp +++ b/source/text/shared/guide/error_report.xhp @@ -35,7 +35,7 @@ MW changed "reporting..." to "reports;" -Error Report Tool +Error Report Tool The Error Report Tool starts automatically when a program crash occurs.removed sentene about manually - i96770 The Error Report Tool gathers all necessary information that can help the program developers to improve the code, so that in later versions this error can possibly be avoided. Please help us to improve the software and send the generated error report. diff --git a/source/text/simpress/01/0608.xhp b/source/text/simpress/01/0608.xhp index 3b53de4..97b778a 100644 --- a/source/text/simpress/01/0608.xhp +++ b/source/text/simpress/01/0608.xhp @@ -38,7 +38,7 @@ Slide Show Settings -Defines settings for your slide show, including which slide to start from, the way you advance the slides, the type of presentation, and pointer options. +Defines settings for your slide show, including which slide to start from, the way you advance the slides, the type of presentation, and pointer options. commit bef19302118a8c8e349db3d9b7417419d53586f0 Author: Christian Lohmaier Date: Mon May 23 21:49:05 2016 +0200 remove duplicated variable (export_as_pdf same as ref_pdf_export) Change-Id: I015e9674bf72e74e3d3ec69087dfd289adfa121f diff --git a/source/text/shared/01/ref_pdf_export.xhp b/source/text/shared/01/ref_pdf_export.xhp index de7d9c1..a1d9546 100644 --- a/source/text/shared/01/ref_pdf_export.xhp +++ b/source/text/shared/01/ref_pdf_export.xhp @@ -38,7 +38,7 @@ -Export as PDF +Export as PDF Saves the current file to Portable Document Format (PDF) version 1.4. A PDF file can be viewed and printed on any platform with the original formatting intact, provided that supporting software is installed. diff --git a/source/text/shared/01/ref_pdf_send_as.xhp b/source/text/shared/01/ref_pdf_send_as.xhp index 47e8ef7..6688d8f 100644 --- a/source/text/shared/01/ref_pdf_send_as.xhp +++ b/source/text/shared/01/ref_pdf_send_as.xhp @@ -40,7 +40,7 @@ - + ___ 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 7073b9c34cdcc34d7075342a4fef0e59dd113ace Author: Christian Lohmaier Date: Mon May 23 21:57:51 2016 +0200 Updated core Project: help caeff7f2fb309f76e5a74cab62016bf2d185840a remove spurious space before Change-Id: I06d328b73455d5b6ea04d7c04c9b09fcb7bad366 diff --git a/helpcontent2 b/helpcontent2 index 30ecec1..caeff7f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 30ecec125c4383354379201fc1191fccfb082059 +Subproject commit caeff7f2fb309f76e5a74cab62016bf2d185840a ___ 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/00/0412.xhp | 10 - source/text/scalc/01/04060101.xhp | 185 -- source/text/shared/optionen/01010300.xhp |7 - source/text/swriter/classificationbar.xhp | 18 +- 4 files changed, 71 insertions(+), 149 deletions(-) New commits: commit 30ecec125c4383354379201fc1191fccfb082059 Author: Christian Lohmaier Date: Mon May 23 21:13:04 2016 +0200 remove obsolete attributes from changed strings as it doesn't matter if the context changes, since they'll need to be modified by translators anyway Change-Id: I120289e3d944030ba1933c888795137d7ef71324 diff --git a/source/text/scalc/00/0412.xhp b/source/text/scalc/00/0412.xhp index ec6126a..f7af3bf 100644 --- a/source/text/scalc/00/0412.xhp +++ b/source/text/scalc/00/0412.xhp @@ -36,7 +36,7 @@ Choose Data - Select Range -Choose Data - Sort... +Choose Data - Sort... Choose Data - Sort - Sort Criteria tab @@ -71,7 +71,7 @@ Choose Data - Filter -Choose Data - AutoFilter +Choose Data - AutoFilter On Tools bar or Table Data bar, click @@ -89,14 +89,14 @@ -Choose Data - More Filters - Advanced Filter... +Choose Data - More Filters - Advanced Filter... Choose Data - More Filters - Standard Filter... - Options label Choose Data - More Filters - Advanced Filter... - Options label -Choose Data - More Filters - Reset Filter +Choose Data - More Filters - Reset Filter On Table Data bar, click Reset Filter/Sort @@ -113,7 +113,7 @@ -Choose Data - More Filter - Hide AutoFilter +Choose Data - More Filter - Hide AutoFilter Choose Data - Subtotals diff --git a/source/text/scalc/01/04060101.xhp b/source/text/scalc/01/04060101.xhp index 9097b0f..cceac7d 100644 --- a/source/text/scalc/01/04060101.xhp +++ b/source/text/scalc/01/04060101.xhp @@ -32,8 +32,7 @@ databases; functions in $[officename] Calc Database Functions - This section deals with functions used with data organized as one row of data for one record. - + This section deals with functions used with data organized as one row of data for one record. The Database category may be confused with a database integrated in $[officename]. However, there is no connection between a database in $[officename] and the Database category in $[officename] Calc. Example Data: @@ -91,7 +90,7 @@ - 2 + 2 @@ -99,29 +98,21 @@ - -3 - + 3 - -9 - + 9 - -150 - + 150 - -40 - + 40 - 3 + 3 @@ -129,29 +120,21 @@ - -4 - + 4 - -10 - + 10 - -1000 - + 1000 - -42 - + 42 - 4 + 4 @@ -159,29 +142,21 @@ - -3 - + 3 - -10 - + 10 - -300 - + 300 - -51 - + 51 - 5 + 5 @@ -189,29 +164,21 @@ - -5 - + 5 - -11 - + 11 - -1200 - + 1200 - -48 - + 48 - 6 + 6 @@ -219,29 +186,21 @@ - -2 - + 2 - -8 - + 8 - -650 - + 650 - -33 - + 33 - 7 + 7 @@ -249,29 +208,21 @@ - -2 - + 2 - -7 - + 7 - -300 - + 300 - -42 - +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 242001a3a03f3008725d8b97cf5a8641437bd9a9 Author: Christian Lohmaier Date: Mon May 23 21:13:04 2016 +0200 Updated core Project: help 30ecec125c4383354379201fc1191fccfb082059 remove obsolete attributes from changed strings as it doesn't matter if the context changes, since they'll need to be modified by translators anyway Change-Id: I120289e3d944030ba1933c888795137d7ef71324 diff --git a/helpcontent2 b/helpcontent2 index 1ab77b7..30ecec1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1ab77b7cc2e30fdd7ee68d3ae2f9777225003186 +Subproject commit 30ecec125c4383354379201fc1191fccfb082059 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes21' -
0 files changed New commits: commit 7e9ad88c28662b7d4c31e97c8f67049bc59e61a4 Author: László Németh Date: Mon May 23 20:48:43 2016 +0200 empty commit (new odt) Change-Id: I0c227d6af64818614e2fd7f03d6ee0fd10d8021d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: uui/source uui/uiconfig
uui/source/authfallbackdlg.cxx |9 +
uui/source/authfallbackdlg.hxx |2 ++
uui/uiconfig/ui/authfallback.ui | 26 --
3 files changed, 35 insertions(+), 2 deletions(-)
New commits:
commit 5dee1106703a14c0128880736db77cd7507df776
Author: Szymon KÅos
Date: Mon May 23 19:49:31 2016 +0200
Google 2FA: better info for user
Google sends SMS with code in format "G-XX".
User should enter only numbers wihout "G-".
+ added "G-" label which is shown in the Google
authentication code request before PIN field
Change-Id: I8eaecbbe7b8803269444f947e97ee67c33db61b2
diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx
index a6383d1..db0448e 100644
--- a/uui/source/authfallbackdlg.cxx
+++ b/uui/source/authfallbackdlg.cxx
@@ -23,6 +23,7 @@ AuthFallbackDlg::AuthFallbackDlg(Window* pParent, const
OUString& instructions,
get( m_pEDCode, "code" );
get( m_pBTOk, "ok" );
get( m_pBTCancel, "cancel" );
+get( m_pFTGooglePrefixLabel, "google_prefix_label" );
m_pBTOk->SetClickHdl( LINK( this, AuthFallbackDlg, OKHdl) );
m_pBTCancel->SetClickHdl( LINK( this, AuthFallbackDlg, CancelHdl) );
@@ -30,9 +31,17 @@ AuthFallbackDlg::AuthFallbackDlg(Window* pParent, const
OUString& instructions,
m_pTVInstructions->SetText( instructions );
if( url.isEmpty() )
+{
+// Google 2FA
+m_pFTGooglePrefixLabel->Show();
m_pEDUrl->Hide();
+}
else
+{
+// OneDrive
+m_pFTGooglePrefixLabel->Hide();
m_pEDUrl->SetText( url );
+}
}
AuthFallbackDlg::~AuthFallbackDlg()
diff --git a/uui/source/authfallbackdlg.hxx b/uui/source/authfallbackdlg.hxx
index b90bb15..9e5eb52 100644
--- a/uui/source/authfallbackdlg.hxx
+++ b/uui/source/authfallbackdlg.hxx
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
class AuthFallbackDlg : public ModalDialog
@@ -24,6 +25,7 @@ private:
VclPtr m_pEDCode;
VclPtr m_pBTOk;
VclPtr m_pBTCancel;
+VclPtr m_pFTGooglePrefixLabel;
public:
AuthFallbackDlg(Window* pParent, const OUString& instructions,
diff --git a/uui/uiconfig/ui/authfallback.ui b/uui/uiconfig/ui/authfallback.ui
index 6c99edf..dbeb5b5 100644
--- a/uui/uiconfig/ui/authfallback.ui
+++ b/uui/uiconfig/ui/authfallback.ui
@@ -92,10 +92,32 @@
-
+
True
False
-â
+
+
+False
+G-
+
+
+False
+True
+0
+
+
+
+
+True
+False
+â
+
+
+False
+True
+1
+
+
False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/inftxt.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 7f07c69df4110db804fd47193135c19b249cbbed Author: Stephan Bergmann Date: Mon May 23 17:29:53 2016 +0200 -Werror,-Wunused-private-field Change-Id: Ia30ad12d63423252c527de096cd1ae0ba3fd6aa5 diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index a627a18..0fb3c58 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -361,7 +361,6 @@ class SwTextPaintInfo : public SwTextSizeInfo const SwWrongList *pSmartTags; std::vector* pSpaceAdd; const SvxBrushItem *pBrushItem; // For the background -SwRect aItemRect; // Also for the background SwTextFlyaTextFly;// Calculate the FlyFrame Point aPos; // Paint position SwRect aPaintRect; // Original paint rect (from Layout paint) ___ 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-1-0' - 51 commits - loleaflet/build loleaflet/debug loleaflet/dist loleaflet/Makefile loleaflet/po loleaflet/reference.html
dev/null |binary loleaflet/Makefile|7 loleaflet/build/deps.js | 85 - loleaflet/debug/document/document_simple_example.html | 125 - loleaflet/debug/document/loleaflet.html |5 loleaflet/dist/contextMenu/jquery.contextMenu.css | 16 loleaflet/dist/images/lc_checkbox.png |binary loleaflet/dist/images/lc_inserttable.png |binary loleaflet/dist/images/lc_radiobutton.png |binary loleaflet/dist/images/sc_inserttable.png |binary loleaflet/dist/l10n/uno-localizations.json| 122 + loleaflet/dist/l10n/uno/ab.json |1 loleaflet/dist/l10n/uno/af.json |1 loleaflet/dist/l10n/uno/am.json |1 loleaflet/dist/l10n/uno/an.json |1 loleaflet/dist/l10n/uno/ar.json |1 loleaflet/dist/l10n/uno/as.json |1 loleaflet/dist/l10n/uno/ast.json |1 loleaflet/dist/l10n/uno/az.json |1 loleaflet/dist/l10n/uno/be.json |1 loleaflet/dist/l10n/uno/bg.json |1 loleaflet/dist/l10n/uno/bn-IN.json|1 loleaflet/dist/l10n/uno/bn.json |1 loleaflet/dist/l10n/uno/bo.json |1 loleaflet/dist/l10n/uno/br.json |1 loleaflet/dist/l10n/uno/brx.json |1 loleaflet/dist/l10n/uno/bs.json |1 loleaflet/dist/l10n/uno/ca-valencia.json |1 loleaflet/dist/l10n/uno/ca.json |1 loleaflet/dist/l10n/uno/cs.json |1 loleaflet/dist/l10n/uno/cy.json |1 loleaflet/dist/l10n/uno/da.json |1 loleaflet/dist/l10n/uno/de.json |1 loleaflet/dist/l10n/uno/dgo.json |1 loleaflet/dist/l10n/uno/dz.json |1 loleaflet/dist/l10n/uno/el.json |1 loleaflet/dist/l10n/uno/en-GB.json|1 loleaflet/dist/l10n/uno/en-ZA.json|1 loleaflet/dist/l10n/uno/eo.json |1 loleaflet/dist/l10n/uno/es.json |1 loleaflet/dist/l10n/uno/et.json |1 loleaflet/dist/l10n/uno/eu.json |1 loleaflet/dist/l10n/uno/fa.json |1 loleaflet/dist/l10n/uno/fi.json |1 loleaflet/dist/l10n/uno/fr.json |1 loleaflet/dist/l10n/uno/ga.json |1 loleaflet/dist/l10n/uno/gd.json |1 loleaflet/dist/l10n/uno/gl.json |1 loleaflet/dist/l10n/uno/gu.json |1 loleaflet/dist/l10n/uno/gug.json |1 loleaflet/dist/l10n/uno/he.json |1 loleaflet/dist/l10n/uno/hi.json |1 loleaflet/dist/l10n/uno/hr.json |1 loleaflet/dist/l10n/uno/hu.json |1 loleaflet/dist/l10n/uno/id.json |1 loleaflet/dist/l10n/uno/is.json |1 loleaflet/dist/l10n/uno/it.json |1 loleaflet/dist/l10n/uno/ja.json |1 loleaflet/dist/l10n/uno/jv.json |1 loleaflet/dist/l10n/uno/ka.json |1 loleaflet/dist/l10n/uno/kk.json |1 loleaflet/dist/l10n/uno/kl.json |1 loleaflet/dist/l10n/uno/km.json |1 loleaflet/dist/l10n/uno/kmr-Latn.json |1 loleaflet/dist/l10n/uno/kn.json |1 loleaflet/dist/l10n/uno/ko.json |1 loleaflet/dist/l10n/uno/kok.json |1 loleaflet/dist/l10n/uno/ks.json |1 loleaflet/dist/l10n/uno/ky.json |1 loleaflet/dist/l10n/uno/lb.json |1 loleaflet/dist/l10n/uno/lo.json |1 loleaflet/dist/l10n/uno/lt.json |1 loleaflet/dist/l10n/uno/lv.json |1 loleaflet/dist/l10n/uno/mai.json |1 loleaflet/dist/l10n/uno/mk.json |1 loleaflet/dist/l10n/uno/ml.json |1 loleaflet/dist/l10n/uno/mn.json |1 loleaflet/dist/l10n/uno/mni.json |1 loleaflet/dist/l10n/uno/mr.json |1 loleaflet/dist/l10
Hardware dependent digital signage software与您共享了相册。
Dear Sirs, I am a sales manager at SYS Tech , a company focus on digital signage solution. Our digital signage software systemsign2000 features as following : SaaS based Hardware dependent No monthly/Annual Fees Manage centralized from any device(PC/Tablet/Phone),using any operation system Multi Media & Multi Windows Presentation Easy Template Creation Local and Central Scheduling Content Update Powerful Remote Management 90 days free trial account is available now. Welcome contact us to get trial account . Best Regards Anna Wang Manager|Sales department No.3 Section Tsinghua Hi-Tech Park, Nanshan, Shenzhen, China https://picasaweb.google.com/lh/sredir?uname=105628464363524519201&target=ALBUM&id=6269893617998221633&authkey=Gv1sRgCNqv3LbkqK2HMQ&invite=CP6ihsMH&feat=email ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/fixes21' -
0 files changed New commits: commit 190ec0928c8d6b96b6b0018fcf207b7cb6a5af11 Author: László Németh Date: Mon May 23 16:41:14 2016 +0200 empty commit (orig) Change-Id: Iee579465dadeb062d1340facc4368ac2feced216 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/Makefile
loleaflet/Makefile |1 + 1 file changed, 1 insertion(+) New commits: commit d2a7be0b6ed9f9d82e2cff5687841ab22562d747 Author: Pranav Kant Date: Mon May 23 20:08:06 2016 +0530 loleaflet: Enforce linting during make Change-Id: I509b13cb9f70c6de66b1906b76c4a968e05322f4 diff --git a/loleaflet/Makefile b/loleaflet/Makefile index d1cd094..f7b575e 100644 --- a/loleaflet/Makefile +++ b/loleaflet/Makefile @@ -11,6 +11,7 @@ DRAW_VERSION=0.2.4 all: npm install jake build + jake lint rm -rf dist/plugins/draw-$(DRAW_VERSION) && mkdir -p dist/plugins/draw-$(DRAW_VERSION) cd plugins/draw-$(DRAW_VERSION) && jake build && cp -ar dist ../../dist/plugins/draw-$(DRAW_VERSION) ___ 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/ui/docshell/docsh.cxx | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 43030487c45f49bccdfad987c60d9483b938ebac
Author: Eike Rathke
Date: Mon May 23 14:11:21 2016 +0200
Resolves: tdf#86282 do not use file name as sheet name for linked documents
... and external references.
Change-Id: I6e23eeff39086091f13914a3f964aec1016a7de4
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index de05c84..6559d9f 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1199,8 +1199,15 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
aDocument.StartAllListeners();
sc::SetFormulaDirtyContext aCxt;
aDocument.SetAllFormulasDirty(aCxt);
-INetURLObject
aURLObjForDefaultNameSheetName(rMedium.GetName());
-
aDocument.RenameTab(0,aURLObjForDefaultNameSheetName.GetBase());
+if (GetCreateMode() != SfxObjectCreateMode::INTERNAL)
+{
+// ScDocShell was not created with
+// SfxModelFlags::EXTERNAL_LINK for which we do not
+// want Sheet1 renamed in order to get predictable
+// sheet names for external references.
+INetURLObject
aURLObjForDefaultNameSheetName(rMedium.GetName());
+
aDocument.RenameTab(0,aURLObjForDefaultNameSheetName.GetBase());
+}
bOverflowRow = aImpEx.IsOverflowRow();
bOverflowCol = aImpEx.IsOverflowCol();
bOverflowCell = aImpEx.IsOverflowCell();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkdata.cxx | 18 +++--- 1 file changed, 11 insertions(+), 7 deletions(-) New commits: commit 81a8d1250319023f6ca272e0b233ef638cae40f7 Author: Caolán McNamara Date: Mon May 23 15:02:21 2016 +0100 Resolves: tdf#99874 gtk3: all-black xbm cursors Change-Id: I1feca80dd75f7a09e05ac43293e8645da391a775 diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx index 3480fe1..3aae62b 100644 --- a/vcl/unx/gtk3/gtk3gtkdata.cxx +++ b/vcl/unx/gtk3/gtk3gtkdata.cxx @@ -183,31 +183,35 @@ GdkCursor* GtkSalDisplay::getFromXBM( const unsigned char *pBitmap, int cairo_stride = cairo_format_stride_for_width(CAIRO_FORMAT_A1, nWidth); unsigned char *pPaddedXBM = ensurePaddedForCairo(pBitmap, nWidth, nHeight, cairo_stride); -cairo_surface_t *s = cairo_image_surface_create_for_data( +cairo_surface_t *source = cairo_image_surface_create_for_data( pPaddedXBM, CAIRO_FORMAT_A1, nWidth, nHeight, cairo_stride); -cairo_t *cr = cairo_create(s); unsigned char *pPaddedMaskXBM = ensurePaddedForCairo(pMask, nWidth, nHeight, cairo_stride); cairo_surface_t *mask = cairo_image_surface_create_for_data( pPaddedMaskXBM, CAIRO_FORMAT_A1, nWidth, nHeight, cairo_stride); + +cairo_surface_t *s = cairo_surface_create_similar(source, CAIRO_CONTENT_ALPHA, nWidth, nHeight); +cairo_t *cr = cairo_create(s); +cairo_set_source_surface(cr, source, 0, 0); cairo_mask_surface(cr, mask, 0, 0); cairo_destroy(cr); + +GdkCursor *cursor = gdk_cursor_new_from_surface(m_pGdkDisplay, s, nXHot, nYHot); + +cairo_surface_destroy(s); cairo_surface_destroy(mask); +cairo_surface_destroy(source); + if (pPaddedMaskXBM != pMask) delete [] pPaddedMaskXBM; -GdkPixbuf *pixbuf = gdk_pixbuf_get_from_surface(s, 0, 0, nWidth, nHeight); -cairo_surface_destroy(s); if (pPaddedXBM != pBitmap) delete [] pPaddedXBM; -GdkCursor *cursor = gdk_cursor_new_from_pixbuf(m_pGdkDisplay, pixbuf, nXHot, nYHot); -g_object_unref(pixbuf); - return cursor; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/optsave.cxx |7 +++
cui/source/options/optsave.hxx |2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit bfc51d3fa8cd72e70837be1a9d1bc2195dc8ccf4
Author: Xisco Fauli
Date: Mon May 23 02:02:36 2016 +0200
tdf#89329: use unique_ptr for pImpl in optsave
Change-Id: Ia442a6a5c570c45b03fc878099f1c50005ee7538
Reviewed-on: https://gerrit.libreoffice.org/25331
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index cbf4d7d..1130bb8 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -81,7 +81,7 @@ SvxSaveTabPage_Impl::~SvxSaveTabPage_Impl()
SvxSaveTabPage::SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet&
rCoreSet ) :
SfxTabPage( pParent, "OptSavePage", "cui/ui/optsavepage.ui", &rCoreSet ),
-pImpl ( new SvxSaveTabPage_Impl )
+pImpl( new SvxSaveTabPage_Impl )
{
get(aLoadUserSettingsCB, "load_settings");
get(aLoadDocPrinterCB, "load_docprinter");
@@ -201,8 +201,7 @@ SvxSaveTabPage::~SvxSaveTabPage()
void SvxSaveTabPage::dispose()
{
-delete pImpl;
-pImpl = nullptr;
+pImpl.reset();
aLoadUserSettingsCB.clear();
aLoadDocPrinterCB.clear();
aDocInfoCB.clear();
@@ -586,7 +585,7 @@ IMPL_LINK_TYPED( SvxSaveTabPage, FilterHdl_Impl, ListBox&,
rBox, void )
{
const sal_Int32 nEntryPos =
aSaveAsLB->InsertEntry(pUIFilters[i]);
if ( pImpl->aODFArr[nData][i] )
-aSaveAsLB->SetEntryData( nEntryPos,
static_cast(pImpl) );
+aSaveAsLB->SetEntryData( nEntryPos,
static_cast(pImpl.get()) );
if(pFilters[i] == pImpl->aDefaultArr[nData])
sSelect = pUIFilters[i];
}
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index d97c323..53f5f9e 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -57,7 +57,7 @@ private:
VclPtr aODFWarningFI;
VclPtr aODFWarningFT;
-SvxSaveTabPage_Impl*pImpl;
+std::unique_ptrpImpl;
DECL_LINK_TYPED( AutoClickHdl_Impl, Button*, void );
DECL_LINK_TYPED( FilterHdl_Impl, ListBox&, void );
___
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/crashreport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 908e46c7116d62718fc377b1e0eb53b39d42dc1f Author: Markus Mohrhard Date: Mon May 23 15:27:23 2016 +0200 use the TDF server as target for crash reports Change-Id: I0518bbad2f3550f8cac453c98af88a092448b5cd diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx index 06e3c99..b9af1b7 100644 --- a/desktop/source/app/crashreport.cxx +++ b/desktop/source/app/crashreport.cxx @@ -45,7 +45,7 @@ void CrashReporter::writeCommonInfo() std::ofstream minidump_file(ini_path, std::ios_base::trunc); minidump_file << "ProductName=LibreOffice\n"; minidump_file << "Version=" LIBO_VERSION_DOTTED "\n"; -minidump_file << "URL=http://127.0.0.1:8000/submit\n";; +minidump_file << "URL=http://crashreport.libreoffice.org/submit\n";; minidump_file.close(); updateMinidumpLocation(); ___ 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/loleaflet-help.html |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b946b3b8c21a930eceef72b2bb0a9489adf6db83 Author: Andras Timar Date: Mon May 23 15:23:24 2016 +0200 Ctrl + Down Arrow in fact jumps to the beginning of next paragraph diff --git a/loleaflet/dist/loleaflet-help.html b/loleaflet/dist/loleaflet-help.html index 8ce9288..ddb854b 100644 --- a/loleaflet/dist/loleaflet-help.html +++ b/loleaflet/dist/loleaflet-help.html @@ -98,7 +98,7 @@ Select to beginning of paragraph Ctrl + Shift + Arrow Up Move cursor down one line Arrow Down Select lines in downwards direction Shift + Arrow Down - Move cursor to end of the previous paragraph Ctrl + Arrow Down + Move cursor to beginning of the next paragraph Ctrl + Arrow Down Select to end of paragraph Ctrl + Shift + Arrow Down Go to beginning of line Home Go and select to the beginning of a line Shift + Home @@ -215,7 +215,7 @@ Select to beginning of paragraph Ctrl + Shift + Arrow Up Move cursor down one line Arrow Down Select lines in downwards direction Shift + Arrow Down - Move cursor to end of the previous paragraph Ctrl + Arrow Down + Move cursor to beginning of the next paragraph Ctrl + Arrow Down Select to end of paragraph Ctrl + Shift + Arrow Down Go to beginning of line Home Go and select to the beginning of a line Shift + Home ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist loleaflet/src
loleaflet/dist/toolbar/toolbar.js |2 +-
loleaflet/src/dom/Draggable.js|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2bc0f09a227220656ea45d8da3f5c9786d10db2a
Author: Christian Lohmaier
Date: Mon May 23 15:12:00 2016 +0200
typo: horizontaly â horizontally
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index d3bc568..ad13560 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -34,7 +34,7 @@ $(function () {
{ 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 horizontaly"), uno: 'CenterPara', unosheet:
'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short",
"value":"2"}}' },
+ { 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' },
diff --git a/loleaflet/src/dom/Draggable.js b/loleaflet/src/dom/Draggable.js
index aebaf11..9924510 100644
--- a/loleaflet/src/dom/Draggable.js
+++ b/loleaflet/src/dom/Draggable.js
@@ -104,7 +104,7 @@ L.Draggable = L.Evented.extend({
offset = offset.add(correction);
}
if (this._map.getDocSize().x < this._map.getSize().x) {
- // don't pan horizontaly when the document fits
in the viewing
+ // don't pan horizontally when the document
fits in the viewing
// area horizontally (docWidth < viewAreaWidth)
offset.x = 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/frmdescr.hxx|2 +-
sfx2/source/doc/frmdescr.cxx | 34 --
2 files changed, 17 insertions(+), 19 deletions(-)
New commits:
commit fb5b0f59b9c923f235eb40b5cef69f8e9a1d9eeb
Author: Xisco Fauli
Date: Sun May 22 15:37:58 2016 +0200
tdf#89329: use unique_ptr for pImpl in frmdescr
Change-Id: I337e1ee34fe1571ca75c8ff8762b5d43fecc2cb4
Reviewed-on: https://gerrit.libreoffice.org/25310
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index ae28c0e..dfec93d 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -79,7 +79,7 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor
boolbResizeVertical;
boolbHasUI;
boolbReadOnly;
-SfxFrameDescriptor_Impl* pImp;
+std::unique_ptr< SfxFrameDescriptor_Impl > pImpl;
public:
SfxFrameDescriptor();
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 8b67a02..86c654a 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -49,22 +49,20 @@ SfxFrameDescriptor::SfxFrameDescriptor() :
bResizeHorizontal( true ),
bResizeVertical( true ),
bHasUI( true ),
-bReadOnly( false )
+bReadOnly( false ),
+pImpl( new SfxFrameDescriptor_Impl )
{
-
-pImp = new SfxFrameDescriptor_Impl;
}
SfxFrameDescriptor::~SfxFrameDescriptor()
{
-delete pImp;
}
SfxItemSet* SfxFrameDescriptor::GetArgs()
{
-if( !pImp->pArgs )
-pImp->pArgs = new SfxAllItemSet( SfxGetpApp()->GetPool() );
-return pImp->pArgs;
+if( !pImpl->pArgs )
+pImpl->pArgs = new SfxAllItemSet( SfxGetpApp()->GetPool() );
+return pImpl->pArgs;
}
void SfxFrameDescriptor::SetURL( const OUString& rURL )
@@ -76,8 +74,8 @@ void SfxFrameDescriptor::SetURL( const OUString& rURL )
void SfxFrameDescriptor::SetActualURL( const OUString& rURL )
{
aActualURL = INetURLObject(rURL);
-if ( pImp->pArgs )
-pImp->pArgs->ClearItem();
+if ( pImpl->pArgs )
+pImpl->pArgs->ClearItem();
}
void SfxFrameDescriptor::SetActualURL( const INetURLObject& rURL )
@@ -87,12 +85,12 @@ void SfxFrameDescriptor::SetActualURL( const INetURLObject&
rURL )
void SfxFrameDescriptor::SetEditable( bool bSet )
{
-pImp->bEditable = bSet;
+pImpl->bEditable = bSet;
}
bool SfxFrameDescriptor::IsEditable() const
{
-return pImp->bEditable;
+return pImpl->bEditable;
}
SfxFrameDescriptor* SfxFrameDescriptor::Clone() const
@@ -113,13 +111,13 @@ SfxFrameDescriptor* SfxFrameDescriptor::Clone() const
pFrame->bHasUI = bHasUI;
pFrame->SetReadOnly( IsReadOnly() );
pFrame->SetEditable( IsEditable() );
-if ( pImp->pWallpaper )
-pFrame->pImp->pWallpaper = new Wallpaper( *pImp->pWallpaper );
-if( pImp->pArgs )
+if ( pImpl->pWallpaper )
+pFrame->pImpl->pWallpaper = new Wallpaper( *pImpl->pWallpaper );
+if( pImpl->pArgs )
{
// Currently in the clone of SfxAllItemSets there is still a bug ...
-pFrame->pImp->pArgs = new SfxAllItemSet( SfxGetpApp()->GetPool() );
-pFrame->pImp->pArgs->Put(*pImp->pArgs);
+pFrame->pImpl->pArgs = new SfxAllItemSet( SfxGetpApp()->GetPool() );
+pFrame->pImpl->pArgs->Put(*pImpl->pArgs);
}
pFrame->nItemId = nItemId;
@@ -129,10 +127,10 @@ SfxFrameDescriptor* SfxFrameDescriptor::Clone() const
void SfxFrameDescriptor::SetWallpaper( const Wallpaper& rWallpaper )
{
-DELETEZ( pImp->pWallpaper );
+DELETEZ( pImpl->pWallpaper );
if ( rWallpaper.GetStyle() != WallpaperStyle::NONE )
-pImp->pWallpaper = new Wallpaper( rWallpaper );
+pImpl->pWallpaper = new Wallpaper( rWallpaper );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
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 58544f07e133356d6109dab8a7d1168c91289cfe Author: Andras Timar Date: Mon May 23 14:58:46 2016 +0200 Updated core Project: help 1ab77b7cc2e30fdd7ee68d3ae2f9777225003186 Ctrl + Down Arrow in fact jumps to the beginning of next paragraph Change-Id: I5f55da8e8298f7cb3758e931ef3804b7df66bf0c diff --git a/helpcontent2 b/helpcontent2 index d05478e..1ab77b7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d05478e9a284ab1f4189ecc85e50f7205e0d9af3 +Subproject commit 1ab77b7cc2e30fdd7ee68d3ae2f9777225003186 ___ 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/04/0102.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1ab77b7cc2e30fdd7ee68d3ae2f9777225003186 Author: Andras Timar Date: Mon May 23 14:58:46 2016 +0200 Ctrl + Down Arrow in fact jumps to the beginning of next paragraph Change-Id: I5f55da8e8298f7cb3758e931ef3804b7df66bf0c diff --git a/source/text/swriter/04/0102.xhp b/source/text/swriter/04/0102.xhp index 7f9387f..3de1b0b 100644 --- a/source/text/swriter/04/0102.xhp +++ b/source/text/swriter/04/0102.xhp @@ -646,7 +646,7 @@ Ctrl+Arrow Down - Move cursor to end of paragraph. + Move cursor to beginning of next paragraph. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/sidebar/SlideBackground.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit b810b92fa4b580958b7134aecd245abd7100ba6e Author: Katarina Behrens Date: Mon May 23 14:54:29 2016 +0200 PaperOrientationModifyHdl is now unused Change-Id: Ibaa4fa23e83a2820931add5597cc96c9a8250fef diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx index bd98393..0bffcdd 100644 --- a/sd/source/ui/sidebar/SlideBackground.hxx +++ b/sd/source/ui/sidebar/SlideBackground.hxx @@ -105,7 +105,6 @@ private: DECL_LINK_TYPED(FillBackgroundHdl, ListBox&, void); DECL_LINK_TYPED(FillStyleModifyHdl, ListBox&, void); DECL_LINK_TYPED(PaperSizeModifyHdl, ListBox&, void); -DECL_LINK_TYPED(PaperOrientationModifyHdl, ListBox&, void); DECL_LINK_TYPED(FillColorHdl, ListBox&, void); DECL_LINK_TYPED(AssignMasterPage, ListBox&, void); DECL_LINK_TYPED(DspBackground, Button*, void); ___ 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/func_forecastetspiadd.xhp |2 +- source/text/scalc/01/func_forecastetspimult.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit d05478e9a284ab1f4189ecc85e50f7205e0d9af3 Author: Christian Lohmaier Date: Mon May 23 14:51:48 2016 +0200 typo: "the the" â "the" Change-Id: I315fd3151e4b52495f3f55a5a65813b13debd8a6 diff --git a/source/text/scalc/01/func_forecastetspiadd.xhp b/source/text/scalc/01/func_forecastetspiadd.xhp index dfc3532..2178035 100644 --- a/source/text/scalc/01/func_forecastetspiadd.xhp +++ b/source/text/scalc/01/func_forecastetspiadd.xhp @@ -45,7 +45,7 @@ =FORECAST.ETS.PI.ADD(DATE(2014;1;1);Values;Timeline;0,9;1;TRUE();1) - Returns 18.8061295551355, the the additive prediction interval forecast for January 2014 based on Values and Timeline named ranges above, with one sample per period, no missing data, and AVERAGE as aggregation. + Returns 18.8061295551355, the additive prediction interval forecast for January 2014 based on Values and Timeline named ranges above, with one sample per period, no missing data, and AVERAGE as aggregation. =FORECAST.ETS.PI.ADD(DATE(2014;1;1);Values;Timeline;0.8;4;TRUE();7) Returns 23.4416821953741, the additive prediction interval forecast for January 2014 based on Values and Timeline named ranges above, with confidence level of 0.8, period length of 4, no missing data, and SUM as aggregation. diff --git a/source/text/scalc/01/func_forecastetspimult.xhp b/source/text/scalc/01/func_forecastetspimult.xhp index 8d5bd60..534c9b3 100644 --- a/source/text/scalc/01/func_forecastetspimult.xhp +++ b/source/text/scalc/01/func_forecastetspimult.xhp @@ -45,7 +45,7 @@ =FORECAST.ETS.PI.MULT(DATE(2014;1;1);Values;Timeline;0,9;1;TRUE();1) - Returns 20.1040952101013, the the multiplicative prediction interval forecast for January 2014 based on Values and Timeline named ranges above, with one sample per period, no missing data, and AVERAGE as aggregation. + Returns 20.1040952101013, the multiplicative prediction interval forecast for January 2014 based on Values and Timeline named ranges above, with one sample per period, no missing data, and AVERAGE as aggregation. =FORECAST.ETS.PI.MULT(DATE(2014;1;1);Values;Timeline;0.8;4;TRUE();7) Returns 27.5285874381574, the multiplicative prediction interval forecast for January 2014 based on Values and Timeline named ranges above, with confidence level of 0.8, period length of 4, no missing data, and SUM as aggregation. ___ 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 24cdcb91dc8aee57dd4c11134e04c8162b5e8b7c Author: Christian Lohmaier Date: Mon May 23 14:51:48 2016 +0200 Updated core Project: help d05478e9a284ab1f4189ecc85e50f7205e0d9af3 typo: "the the" â "the" Change-Id: I315fd3151e4b52495f3f55a5a65813b13debd8a6 diff --git a/helpcontent2 b/helpcontent2 index 36b3f0c..d05478e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 36b3f0c90d172c341c556f63cc5c312220118b3e +Subproject commit d05478e9a284ab1f4189ecc85e50f7205e0d9af3 ___ 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/exponsmooth_embd.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 36b3f0c90d172c341c556f63cc5c312220118b3e Author: Christian Lohmaier Date: Mon May 23 14:45:15 2016 +0200 typo: periodical_abberation â periodical_aberration Change-Id: I29e6938ddbad2cf31e07a80fadcffa12ced7c839 diff --git a/source/text/scalc/01/exponsmooth_embd.xhp b/source/text/scalc/01/exponsmooth_embd.xhp index c7e2fc6..d97bb3e 100644 --- a/source/text/scalc/01/exponsmooth_embd.xhp +++ b/source/text/scalc/01/exponsmooth_embd.xhp @@ -214,11 +214,11 @@ -forecast = basevalue + trend * âx + periodical_abberation. +forecast = basevalue + trend * âx + periodical_aberration. -forecast = ( basevalue + trend * âx ) * periodical_abberation. +forecast = ( basevalue + trend * âx ) * periodical_aberration. ___ 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 c85b792735f993776be235d3eed1a711344339a2 Author: Christian Lohmaier Date: Mon May 23 14:45:15 2016 +0200 Updated core Project: help 36b3f0c90d172c341c556f63cc5c312220118b3e typo: periodical_abberation â periodical_aberration Change-Id: I29e6938ddbad2cf31e07a80fadcffa12ced7c839 diff --git a/helpcontent2 b/helpcontent2 index 2ab9b7f..36b3f0c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2ab9b7fddbbc6f81dc69a740fc120194a7fd8671 +Subproject commit 36b3f0c90d172c341c556f63cc5c312220118b3e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/progress.hxx |3
sfx2/source/bastyp/progress.cxx | 145 +++-
2 files changed, 74 insertions(+), 74 deletions(-)
New commits:
commit 011734e32806f8435328457a056a3e3b43fb87ad
Author: Xisco Fauli
Date: Sun May 22 18:02:06 2016 +0200
tdf#89329: use unique_ptr for pImpl in progress
Change-Id: Ie591d3ac8af2b1a05be51c672ebf5a6ed7ac87f2
Reviewed-on: https://gerrit.libreoffice.org/25320
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx
index 60729cc..e487ef4 100644
--- a/include/sfx2/progress.hxx
+++ b/include/sfx2/progress.hxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
namespace rtl {
class OUString;
@@ -35,7 +36,7 @@ struct SvProgressArg;
class SFX2_DLLPUBLIC SfxProgress
{
-SfxProgress_Impl* pImp;
+std::unique_ptr< SfxProgress_Impl > pImpl;
sal_uIntPtr nVal;
boolbSuspended;
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 201bc06..3524aea 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -133,31 +133,31 @@ SfxProgress::SfxProgress
A progress-bar will be displayed in the status bar,
*/
-: pImp( new SfxProgress_Impl( rText ) ),
+: pImpl( new SfxProgress_Impl( rText ) ),
nVal(0),
bSuspended(true)
{
-pImp->bRunning = true;
-pImp->bAllowRescheduling = Application::IsInExecute();
-
-pImp->xObjSh = pObjSh;
-pImp->aText = rText;
-pImp->nMax = nRange;
-pImp->bLocked = false;
-pImp->bWaitMode = bWait;
-pImp->nCreate = Get10ThSec();
-pImp->nNextReschedule = pImp->nCreate;
+pImpl->bRunning = true;
+pImpl->bAllowRescheduling = Application::IsInExecute();
+
+pImpl->xObjSh = pObjSh;
+pImpl->aText = rText;
+pImpl->nMax = nRange;
+pImpl->bLocked = false;
+pImpl->bWaitMode = bWait;
+pImpl->nCreate = Get10ThSec();
+pImpl->nNextReschedule = pImpl->nCreate;
SAL_INFO(
"sfx.bastyp",
-"SfxProgress: created for '" << rText << "' at " << pImp->nCreate
+"SfxProgress: created for '" << rText << "' at " << pImpl->nCreate
<< "ds");
-pImp->pWorkWin = nullptr;
-pImp->pView = nullptr;
+pImpl->pWorkWin = nullptr;
+pImpl->pView = nullptr;
-pImp->pActiveProgress = GetActiveProgress( pObjSh );
+pImpl->pActiveProgress = GetActiveProgress( pObjSh );
if ( pObjSh )
pObjSh->SetProgress_Impl(this);
-else if( !pImp->pActiveProgress )
+else if( !pImpl->pActiveProgress )
SfxGetpApp()->SetProgress_Impl(this);
Resume();
}
@@ -173,9 +173,8 @@ SfxProgress::~SfxProgress()
{
Stop();
-if ( pImp->xStatusInd.is() )
-pImp->xStatusInd->end();
-delete pImp;
+if ( pImpl->xStatusInd.is() )
+pImpl->xStatusInd->end();
}
@@ -187,26 +186,26 @@ void SfxProgress::Stop()
*/
{
-if( pImp->pActiveProgress )
+if( pImpl->pActiveProgress )
{
-if ( pImp->xObjSh.Is() && pImp->xObjSh->GetProgress() == this )
-pImp->xObjSh->SetProgress_Impl(nullptr);
+if ( pImpl->xObjSh.Is() && pImpl->xObjSh->GetProgress() == this )
+pImpl->xObjSh->SetProgress_Impl(nullptr);
return;
}
-if ( !pImp->bRunning )
+if ( !pImpl->bRunning )
return;
-pImp->bRunning = false;
+pImpl->bRunning = false;
SAL_INFO(
"sfx.bastyp", "SfxProgress: destroyed at " << Get10ThSec() << "ds");
Suspend();
-if ( pImp->xObjSh.Is() )
-pImp->xObjSh->SetProgress_Impl(nullptr);
+if ( pImpl->xObjSh.Is() )
+pImpl->xObjSh->SetProgress_Impl(nullptr);
else
SfxGetpApp()->SetProgress_Impl(nullptr);
-if ( pImp->bLocked )
-pImp->Enable_Impl();
+if ( pImpl->bLocked )
+pImpl->Enable_Impl();
}
bool SfxProgress::SetStateText
@@ -216,7 +215,7 @@ bool SfxProgress::SetStateText
)
{
-pImp->aStateText = rNewVal;
+pImpl->aStateText = rNewVal;
return SetState( nNewVal );
}
@@ -240,33 +239,33 @@ bool SfxProgress::SetState
*/
{
-if( pImp->pActiveProgress ) return true;
+if( pImpl->pActiveProgress ) return true;
nVal = nNewVal;
// new Range?
-if ( nNewRange && nNewRange != pImp->nMax )
+if ( nNewRange && nNewRange != pImpl->nMax )
{
SAL_INFO(
"sfx.bastyp",
-"SfxProgress: range changed from " << pImp->nMax << " to "
+"SfxProgress: range changed from " << pImpl->nMax << " to "
<< nNewRange);
-pImp->nMax = nNewRange;
+pImpl->nMax = nNewRange;
}
-if ( !pImp->xStatusInd.is() )
+if ( !pImpl->xStatusInd.is() )
{
// get the active ViewFrame of the document this progress is working on
// if it doesn't work on a document, take the current ViewFrame
-
[Libreoffice-commits] help.git: source/text
source/text/shared/01/02200100.xhp|2 +- source/text/shared/01/05020600.xhp|2 +- source/text/shared/01/06130500.xhp|2 +- source/text/shared/autopi/01100400.xhp|2 +- source/text/shared/autopi/01170500.xhp|2 +- source/text/shared/explorer/database/05040200.xhp |2 +- source/text/shared/explorer/database/1102.xhp |2 +- source/text/shared/explorer/database/1103.xhp |2 +- source/text/shared/optionen/01050300.xhp |2 +- source/text/shared/optionen/01060700.xhp |2 +- source/text/shared/optionen/0111.xhp |2 +- source/text/simpress/01/06100100.xhp |2 +- 12 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 2ab9b7fddbbc6f81dc69a740fc120194a7fd8671 Author: Christian Lohmaier Date: Mon May 23 14:29:05 2016 +0200 hid="" â hid="." Change-Id: I64a889f1cd519a0cf1898e913ad68f850d472eb6 diff --git a/source/text/shared/01/02200100.xhp b/source/text/shared/01/02200100.xhp index b6032cc..e735b13 100644 --- a/source/text/shared/01/02200100.xhp +++ b/source/text/shared/01/02200100.xhp @@ -34,7 +34,7 @@ objects; editingediting; objectsEdit - Lets you edit a selected object in your file that you inserted with the Insert â Object command. + Lets you edit a selected object in your file that you inserted with the Insert â Object command. diff --git a/source/text/shared/01/05020600.xhp b/source/text/shared/01/05020600.xhp index 14884fb..bb93abc 100644 --- a/source/text/shared/01/05020600.xhp +++ b/source/text/shared/01/05020600.xhp @@ -39,7 +39,7 @@ Asian Layout -Sets the options for double-line writing for Asian languages. Select the characters in your text, and then choose this command. +Sets the options for double-line writing for Asian languages. Select the characters in your text, and then choose this command. diff --git a/source/text/shared/01/06130500.xhp b/source/text/shared/01/06130500.xhp index 8bfefe3..884a032 100644 --- a/source/text/shared/01/06130500.xhp +++ b/source/text/shared/01/06130500.xhp @@ -33,7 +33,7 @@ Append libraries -Locate the %PRODUCTNAME Basic library that you want to add to the current list, and then click Open. +Locate the %PRODUCTNAME Basic library that you want to add to the current list, and then click Open. File name: Enter a name or the path to the library that you want to append. You can also select a library from the list. diff --git a/source/text/shared/autopi/01100400.xhp b/source/text/shared/autopi/01100400.xhp index 6697ec7..b299f79 100644 --- a/source/text/shared/autopi/01100400.xhp +++ b/source/text/shared/autopi/01100400.xhp @@ -32,7 +32,7 @@ Report Wizard - Choose Layout -Choose the layout from different templates and styles, and choose landscape or portrait page orientation. +Choose the layout from different templates and styles, and choose landscape or portrait page orientation. diff --git a/source/text/shared/autopi/01170500.xhp b/source/text/shared/autopi/01170500.xhp index d386e4a..dea3560 100644 --- a/source/text/shared/autopi/01170500.xhp +++ b/source/text/shared/autopi/01170500.xhp @@ -33,7 +33,7 @@ Field Assignment -Opens a dialog that allows you to specify the field assignment. +Opens a dialog that allows you to specify the field assignment. diff --git a/source/text/shared/explorer/database/05040200.xhp b/source/text/shared/explorer/database/05040200.xhp index 0d950ad..1384270 100644 --- a/source/text/shared/explorer/database/05040200.xhp +++ b/source/text/shared/explorer/database/05040200.xhp @@ -36,6 +36,6 @@ Description Table description -Displays the description for the selected table. +Displays the description for the selected table. diff --git a/source/text/shared/explorer/database/1102.xhp b/source/text/shared/explorer/database/1102.xhp index fb050bd..52ff0a9 100644 --- a/source/text/shared/explorer/database/1102.xhp +++ b/source/text/shared/explorer/database/1102.xhp @@ -31,7 +31,7 @@ ODBCstill some Help IDs in this file. Else it can be removed -Specifies the settings for ODBC databases. This includes your user access data, driver settings, and font definitions. +Specifies the settings for ODBC databases. This includes your user access data, driver settings, and font definitions. User Name diff --git a/source/text/shared/explorer/database/1103.xhp b/source/text/shared/explorer/database/1103.xhp index 0005bcb..e2710a5 100644 --- a/source/text/shared/explorer/database/1103.xhp +++ b/source/text/shared/explorer/database/1103.xhp @@ -29,7 +29,7 @@ ufi: removed remaining two index entriesmw added "(Base)" to all 4 entries and transferred 2 entries to shared/explorer/database/dabawiz02dbase.xhp dBASEstill two Help IDs in this file. Else file can be removed -Specify the settings for a dBASE databas
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 186e39dda733992f3c2979d95897bdd6ff146e3f Author: Christian Lohmaier Date: Mon May 23 14:29:05 2016 +0200 Updated core Project: help 2ab9b7fddbbc6f81dc69a740fc120194a7fd8671 hid="" â hid="." Change-Id: I64a889f1cd519a0cf1898e913ad68f850d472eb6 diff --git a/helpcontent2 b/helpcontent2 index 7f87433..2ab9b7f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7f87433d5583fc8cd8811306521d134735f8cb13 +Subproject commit 2ab9b7fddbbc6f81dc69a740fc120194a7fd8671 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Dictionary_en.mk en/changelog.txt en/en_AU.dic en/en_CA.aff en/en_CA.dic en/en_GB.aff en/en_GB.dic en/en_US.aff en/en_US.dic en/README_en_AU.txt en/README_en_CA
Dictionary_en.mk|2 en/README_en_AU.txt |8 en/README_en_CA.txt | 124 en/README_en_GB.txt |14507 + en/README_en_US.txt | 124 en/changelog.txt| 317 en/en_AU.dic| 393 en/en_CA.aff| 3127 - en/en_CA.dic|98498 --- en/en_GB.aff| 4506 - en/en_GB.dic|104197 +++-- en/en_US.aff| 3114 - en/en_US.dic|98236 --- en/th_en_US_v2.dat | 2346 en/th_en_US_v2.idx |145868 15 files changed, 310950 insertions(+), 164417 deletions(-) New commits: commit 2f0ddaeeb4323ac99afd35d2c4fda643c9ee8bcf Author: Aron Budea Date: Mon May 23 05:29:56 2016 +0200 tdf#97393 Update English Dictionaries to 2016.05.01 release See comment 8 and 9 in tdf#97393. I tested if spell check works with the new dicts in 5.1.3, didn't test install. Change-Id: Ia1b93a029a809975e913e69a93ea6477fd1e4cc5 Reviewed-on: https://gerrit.libreoffice.org/25348 Reviewed-by: Marco A.G.Pinto Reviewed-by: jan iversen Tested-by: jan iversen diff --git a/Dictionary_en.mk b/Dictionary_en.mk index d320c55..04b28e8 100644 --- a/Dictionary_en.mk +++ b/Dictionary_en.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Dictionary_Dictionary,dict-en,dictionaries/en)) $(eval $(call gb_Dictionary_add_root_files,dict-en,\ dictionaries/en/affDescription.txt \ + dictionaries/en/changelog.txt \ dictionaries/en/en_AU.aff \ dictionaries/en/en_AU.dic \ dictionaries/en/en_CA.aff \ @@ -64,6 +65,7 @@ $(eval $(call gb_Dictionary_add_propertyfiles,dict-en,dialog,\ $(eval $(call gb_Dictionary_add_thesauri,dict-en,\ dictionaries/en/th_en_US_v2.dat \ + dictionaries/en/th_en_US_v2.idx \ )) # vim: set noet sw=4 ts=4: diff --git a/en/README_en_AU.txt b/en/README_en_AU.txt index 4495723..b5984e5 100644 --- a/en/README_en_AU.txt +++ b/en/README_en_AU.txt @@ -7,8 +7,9 @@ the en_GB Myspell dictionary which in turn was initially based on a subset of the original English wordlist created by Kevin Atkinson for Pspell and Aspell (also initially licensed under the LGPL.) -Cameron Roy made some improvements and packaged the improved -dictionary for the Australian Dictionary Firefox extension. +Cameron Roy made some improvements, described in the changelog.txt +file, and packaged the improved dictionary for the Australian +Dictionary Firefox extension. David Wilson packaged Cameron Roy's Firefox dictionary into this OpenOffice.org extension: dict-en-au.oxt. @@ -36,6 +37,7 @@ The Free Software Foundation, Inc., I can be contacted via email: en-au-dictionary [at] justcameron [period] com This dictionary was based on the Australian English Dictionary available from http://lingucomponent.openoffice.org/spell_dic.html (Licensed under the LGPL.) In turn, that dictionary was based on the en_GB Myspell dictionary which in turn was initially based on a subset of the original English wordlist created by Kevin Atkinson for Pspell and Aspell (also initially licensed under the LGPL.) +For more info, see changelog.txt Credit to: Kevin Atkinson @@ -44,4 +46,4 @@ Andrew Brown Kelvin Eldridge Brian Kelk Jean Hollis Weber -David Wilson +David Wilson \ No newline at end of file diff --git a/en/README_en_CA.txt b/en/README_en_CA.txt index ca5d017..0c14a5a 100644 --- a/en/README_en_CA.txt +++ b/en/README_en_CA.txt @@ -1,52 +1,96 @@ -Wordlist en_CA spelling and morphological dictionary for OpenOffice.org -Version 2008-12-18 +en_CA Hunspell Dictionary +Version 2016.01.19 +Tue Jan 19 17:07:49 2016 -0500 [a535654] +http://wordlist.sourceforge.net -Based on Wordlist Hunspell dictionaries version 2008-12-05 -and Wordlist POS and AGID data created by Kevin Atkinson -and released on http://wordlist.sourceforge.net. +README file for English Hunspell dictionaries derived from SCOWL. -Other fixes: +These dictionaries are created using the speller/make-hunspell-dict +script in SCOWL. -OOo Issue 48060 - add numbers with affixes by COMPOUNDRULE (1st, 111th, 1990s etc.) -New REP items (better suggestions for accented words and a few mistakes) -OOo Issue 63541 - remove *dessicated, *dessication +The following dictionaries are available: -László Németh + en_US (American) + en_CA (Canadian) + en_GB-ise (British with "ise" spelling) + en_GB-ize (British with "ize" spelling) -Original license: + en_US-large + en_CA-large + en_GB-large (with both "ise" and "ize" spelling) -2008-12-05 Release +The normal (non-large) dictionaries correspond to SCOWL size 60 and, +to encourage consistent spelling, generally only include one spelling +variant for a word. The large dictionaries correspond to SCOWL size +70 and may include multiple spelling for a word when both variants are +considered almost equal. The larger dictionaries however (1) have not +been
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 741b3f1727a59ac266cc3dcf9305d82f660f270b Author: Aron Budea Date: Mon May 23 05:29:56 2016 +0200 Updated core Project: dictionaries 2f0ddaeeb4323ac99afd35d2c4fda643c9ee8bcf tdf#97393 Update English Dictionaries to 2016.05.01 release See comment 8 and 9 in tdf#97393. I tested if spell check works with the new dicts in 5.1.3, didn't test install. Change-Id: Ia1b93a029a809975e913e69a93ea6477fd1e4cc5 Reviewed-on: https://gerrit.libreoffice.org/25348 Reviewed-by: Marco A.G.Pinto Reviewed-by: jan iversen Tested-by: jan iversen diff --git a/dictionaries b/dictionaries index 2c83bec..2f0ddae 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 2c83becf155a7e4303257891efea1c3e55465b08 +Subproject commit 2f0ddaeeb4323ac99afd35d2c4fda643c9ee8bcf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/Rosemary/change-tracking'
New branch 'private/Rosemary/change-tracking' available with the following commits: ___ 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 7bb1a616aa272c96a2662064ed16846f168e6a27
Author: Christian Lohmaier
Date: Mon May 23 14:08:41 2016 +0200
Updated core
Project: help 7f87433d5583fc8cd8811306521d134735f8cb13
"Insert - Field", not "Insert - Fields"
as per LO HIG - https://wiki.documentfoundation.org/Design/MenuBar
("Use singular form in labeling when applicable (e.g. Insert+Shape,
though multiple shapes are listed under the submenu, a user can only
select one item).") and already changed in UI
Change-Id: Id15afe7e3c92b54526ff694f7959ab3e01a2d606
diff --git a/helpcontent2 b/helpcontent2
index a52d4ff..7f87433 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a52d4ff5939aca0856be9a9cd9cda3306931a43e
+Subproject commit 7f87433d5583fc8cd8811306521d134735f8cb13
___
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/shared/00/00040503.xhp |2
source/text/shared/explorer/database/dabawiz02.xhp |2
source/text/simpress/00/0404.xhp | 24 +++---
source/text/swriter/00/0404.xhp| 49 +++--
source/text/swriter/01/0115.xhp|2
source/text/swriter/01/04090200.xhp|6 +-
source/text/swriter/02/18030100.xhp|2
source/text/swriter/02/18030200.xhp|2
source/text/swriter/02/18030300.xhp|2
source/text/swriter/02/18030500.xhp|2
source/text/swriter/02/18030600.xhp|2
source/text/swriter/guide/conditional_text.xhp |4 -
source/text/swriter/guide/conditional_text2.xhp|4 -
source/text/swriter/guide/fields_date.xhp |2
source/text/swriter/guide/fields_enter.xhp |2
source/text/swriter/guide/footer_nextpage.xhp |2
source/text/swriter/guide/footer_pagenumber.xhp|4 -
source/text/swriter/guide/header_with_chapter.xhp |2
source/text/swriter/guide/hidden_text.xhp |8 +--
source/text/swriter/guide/number_sequence.xhp |2
source/text/swriter/guide/pagenumbers.xhp |2
21 files changed, 52 insertions(+), 75 deletions(-)
New commits:
commit 7f87433d5583fc8cd8811306521d134735f8cb13
Author: Christian Lohmaier
Date: Mon May 23 14:08:41 2016 +0200
"Insert - Field", not "Insert - Fields"
as per LO HIG - https://wiki.documentfoundation.org/Design/MenuBar
("Use singular form in labeling when applicable (e.g. Insert+Shape,
though multiple shapes are listed under the submenu, a user can only
select one item).") and already changed in UI
Change-Id: Id15afe7e3c92b54526ff694f7959ab3e01a2d606
diff --git a/source/text/shared/00/00040503.xhp
b/source/text/shared/00/00040503.xhp
index ef86883..69d1d0b 100644
--- a/source/text/shared/00/00040503.xhp
+++ b/source/text/shared/00/00040503.xhp
@@ -50,7 +50,7 @@
Open context menu for a column header in an open database table -
choose Column Format - Format tab
Choose Format - Axis - Y Axis - Numbers tab (Chart
Documents)
-Also as Number Format dialog for tables and fields in
text documents: Choose Format - Number Format, or choose
Insert - Fields - More Fields - Variables tab and select
"Additional formats" in the Format list.
+Also as
Number Format dialog for tables and fields in text documents:
Choose Format - Number Format, or choose Insert - Field -
More Fields - Variables tab and select "Additional formats" in the
Format list.
Choose
Format - Title - Main Title - Alignment tab
diff --git a/source/text/shared/explorer/database/dabawiz02.xhp
b/source/text/shared/explorer/database/dabawiz02.xhp
index 9b21662..c949598 100644
--- a/source/text/shared/explorer/database/dabawiz02.xhp
+++ b/source/text/shared/explorer/database/dabawiz02.xhp
@@ -35,7 +35,7 @@
Specifies whether you want to register the database,
open the database for editing, or insert a new table.
Yes, register the Database for me
-Select to register the database within your user copy
of %PRODUCTNAME. After registering, the database is displayed in the View
- Data Sources window. You must register a database to be able to insert
the database fields in a document (Insert - Fields - More Fields) or in a mail
merge.
+Select to register the database within your user copy of %PRODUCTNAME.
After registering, the database is displayed in the View - Data
Sources window. You must register a database to be able to insert the
database fields in a document (Insert - Field - More Fields) or in a mail
merge.
No, do not register the
database
Select to keep the database information only within
the created database file.
Open the database for editing
diff --git a/source/text/simpress/00/0404.xhp
b/source/text/simpress/00/0404.xhp
index d6e8ca1..5b364b5 100644
--- a/source/text/simpress/00/0404.xhp
+++ b/source/text/simpress/00/0404.xhp
@@ -91,21 +91,13 @@
-Choose Insert - Fields
-
-Choose Insert - Fields - Date
(fixed)
-
-Choose Insert - Fields - Date
(variable)
-
-Choose Insert - Fields - Time
(fixed)
-
-Choose Insert - Fields - Time
(variable)
-
-Choose Insert - Fields - Page
Number
-
-Choose Insert - Fields - Author
-
-Choose Insert - Fields - File
Name
-
+Choose Insert - Field
+Choose Insert - Field - Date
(fixed)
+Choose Insert - Field - Date
(variable)
+Choose Insert - Field - Time
(fixed)
+Choose Insert - Field - Time
(variable)
+Choose Insert - Field - Page
Number
+Choose Insert - Field - Author
+Choose Insert - Field - File
Name
diff --git a/source/text/swriter/00/0404.xhp
b/source/text/swriter/00/0404.xhp
index 8d541c2..a4ab9d4 100644
--- a/source/text/swriter/00/0404.xhp
+++ b/source/text/swriter/00/0404.xhp
@@ -31,27 +31,18 @@
Choose Insert - Manual
Break
-Choose Insert -
[Libreoffice-commits] core.git: cui/source
cui/source/customize/cfg.cxx |4 ++--
cui/source/customize/selector.cxx | 15 +++
cui/source/inc/selector.hxx |2 +-
3 files changed, 6 insertions(+), 15 deletions(-)
New commits:
commit 1765ae3f74c65ad52b79d4ee29ac761f16ddd7bf
Author: Caolán McNamara
Date: Mon May 23 13:05:56 2016 +0100
Resolves: tdf#99981 make ScriptSelectorDialog modal for its parent
Change-Id: Ia522b36cd1f5d47d08afa74a22cec11de465f567
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 6a41380..7b0178b 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2810,7 +2810,7 @@ IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, AddCommandsHdl,
Button *, void )
m_pSelectorDlg->SetImageProvider( GetSaveInData() );
-m_pSelectorDlg->Show();
+m_pSelectorDlg->Execute();
}
SaveInData* SvxMenuConfigPage::CreateSaveInData(
@@ -4690,7 +4690,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage,
AddCommandsHdl, Button *, void )
m_pSelectorDlg->SetImageProvider( GetSaveInData() );
-m_pSelectorDlg->Show();
+m_pSelectorDlg->Execute();
}
IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, AddFunctionHdl,
SvxScriptSelectorDialog&, void )
diff --git a/cui/source/customize/selector.cxx
b/cui/source/customize/selector.cxx
index eba339d..d6a4553 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -904,7 +904,7 @@ void SvxConfigGroupListBox::RequestingChildren(
SvTreeListEntry *pEntry )
SvxScriptSelectorDialog::SvxScriptSelectorDialog(
vcl::Window* pParent, bool bShowSlots, const Reference< frame::XFrame >&
xFrame)
-: ModelessDialog(pParent, "MacroSelectorDialog",
"cui/ui/macroselectordialog.ui")
+: ModalDialog(pParent, "MacroSelectorDialog",
"cui/ui/macroselectordialog.ui")
, m_bShowSlots(bShowSlots)
{
get("libraryft")->Show(!m_bShowSlots);
@@ -964,7 +964,7 @@ void SvxScriptSelectorDialog::dispose()
m_pOKButton.clear();
m_pCancelButton.clear();
m_pDescriptionText.clear();
-ModelessDialog::dispose();
+ModalDialog::dispose();
}
IMPL_LINK_TYPED( SvxScriptSelectorDialog, SelectHdl, SvTreeListBox*, pCtrl,
void )
@@ -1012,16 +1012,7 @@ IMPL_LINK_TYPED( SvxScriptSelectorDialog, ClickHdl,
Button *, pButton, void )
{
if (pButton == m_pCancelButton)
{
-// If we are displaying Slot API commands then the dialog is being
-// run from Tools/Configure and we should not close it, just hide it
-if ( !m_bShowSlots )
-{
-EndDialog();
-}
-else
-{
-Hide();
-}
+EndDialog();
}
else if (pButton == m_pOKButton)
{
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 98b7991..cb5dd42 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -175,7 +175,7 @@ public:
{ m_pImageProvider = provider; }
};
-class SvxScriptSelectorDialog : public ModelessDialog
+class SvxScriptSelectorDialog : public ModalDialog
{
VclPtr m_pDialogDescription;
VclPtr m_pCategories;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/calbck.hxx|1
sw/inc/dbmgr.hxx |1
sw/inc/edimp.hxx |1
sw/inc/fchrfmt.hxx |2 -
sw/inc/fmtcol.hxx|4 --
sw/inc/frmfmt.hxx| 16 -
sw/inc/swbaslnk.hxx |3 -
sw/inc/swserv.hxx|2 -
sw/inc/swtable.hxx |6 ---
sw/inc/swtblfmt.hxx |8
sw/inc/tox.hxx |7
sw/inc/view.hxx |2 -
sw/source/core/access/accfrmobjmap.hxx |6 ---
sw/source/core/inc/SwGrammarMarkUp.hxx |1
sw/source/core/inc/drawfont.hxx |1
sw/source/core/inc/unobookmark.hxx |6 ---
sw/source/core/inc/wrong.hxx |2 -
sw/source/core/table/swtable.cxx |9 -
sw/source/core/text/inftxt.hxx |1
sw/source/core/text/itrtxt.hxx |4 --
sw/source/core/text/porfly.cxx | 14
sw/source/core/text/porfly.hxx |2 -
sw/source/filter/html/htmlvsh.hxx| 39
sw/source/filter/html/swhtml.cxx |1
sw/source/filter/html/swhtml.hxx |1
sw/source/filter/inc/rtf.hxx |2 -
sw/source/filter/inc/wrtswtbl.hxx|3 -
sw/source/filter/ww8/wrtww8.hxx |5 ---
sw/source/filter/ww8/ww8par.hxx | 14
sw/source/ui/dbui/mailmergewizard.cxx| 22 -
sw/source/ui/index/cnttab.cxx|1
sw/source/uibase/cctrl/swlbox.cxx| 18 ---
sw/source/uibase/dbui/mmconfigitem.cxx | 19 ---
sw/source/uibase/inc/autoedit.hxx| 37 --
sw/source/uibase/inc/column.hxx |4 --
sw/source/uibase/inc/content.hxx |9 -
sw/source/uibase/inc/fldmgr.hxx |5 ---
sw/source/uibase/inc/formedt.hxx | 50 ---
sw/source/uibase/inc/mailmergewizard.hxx |1
sw/source/uibase/inc/mmconfigitem.hxx|3 -
sw/source/uibase/inc/numprevw.hxx|7
sw/source/uibase/inc/swlbox.hxx |4 --
sw/source/uibase/inc/swwrtshitem.hxx |1
sw/source/uibase/inc/tablemgr.hxx|8
sw/source/uibase/inc/workctrl.hxx| 13
sw/source/uibase/ribbar/workctrl.cxx |8
sw/source/uibase/table/chartins.cxx |7
sw/source/uibase/uiview/view0.cxx| 10 --
48 files changed, 1 insertion(+), 390 deletions(-)
New commits:
commit 47f62540bd2c2f107313bb0c6f141cd4460b6379
Author: Noel Grandin
Date: Thu May 19 10:31:47 2016 +0200
loplugin:unusedmethods in sw
Change-Id: I05e224bcc7d2b08cf1349c14e3acf274d422e109
Reviewed-on: https://gerrit.libreoffice.org/25145
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 42064d5..8890f6b 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -210,7 +210,6 @@ class SW_DLLPUBLIC SwDepend final : public SwClient
SwClient *m_pToTell;
public:
-SwDepend() : m_pToTell(nullptr) {}
SwDepend(SwClient *pTellHim, SwModify *pDepend) : SwClient(pDepend),
m_pToTell(pTellHim) {}
SwClient* GetToTell() { return m_pToTell; }
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 8acdc55..1e409a6 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -293,7 +293,6 @@ public:
voidMergeCancel();
inline bool IsMergeOk() { return MergeStatus::OK ==
m_aMergeStatus; };
-inline bool IsMergeCancel() { return MergeStatus::CANCEL <=
m_aMergeStatus; };
inline bool IsMergeError() { return MergeStatus::ERROR <=
m_aMergeStatus; };
static SwMailMergeConfigItem* PerformMailMerge(SwView* pView);
diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx
index 20e891a..b9bc4a4 100644
--- a/sw/inc/edimp.hxx
+++ b/sw/inc/edimp.hxx
@@ -30,7 +30,6 @@ struct SwPamRange
{
sal_uLong nStart, nEnd;
-SwPamRange() : nStart( 0 ), nEnd( 0 ) {}
SwPamRange( sal_uLong nS, sal_uLong nE ) : nStart( nS ), nEnd( nE ) {}
bool operator==( const SwPamRange& rRg ) const
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index acd1648..a7d4861 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -33,8 +33,6 @@ class SW_DLLPUBLIC SwFormatCharFormat: public SfxPoolItem,
public SwClient
SwTextCharFormat* pTextAttr; ///< My text attribute.
public:
-SwFormatCharFormat() : pTextAttr(nullptr) {}
-
/// single argument ctors shall be explicit.
explicit SwFormatCharFormat( SwCharFormat *pFormat );
virtual ~SwFormatCharFormat();
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index f69dee7..e7e1b63 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -216,10 +216,6 @@ class SW_DLLPUBLIC SwCondi
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/functions/fods/dproduct.fods | 1515 +++ 1 file changed, 1515 insertions(+) New commits: commit bb45874129d36f96439a45b1eb0c8c03a2956782 Author: ZdenÄk Crhonek Date: Sun May 22 22:03:28 2016 +0200 Add DPRODUCT test case Change-Id: I45e813bfaa3b52fc6bc19382c31bc63b7ecdc9f1 Reviewed-on: https://gerrit.libreoffice.org/25323 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/qa/unit/data/functions/fods/dproduct.fods b/sc/qa/unit/data/functions/fods/dproduct.fods new file mode 100644 index 000..7a41f71 --- /dev/null +++ b/sc/qa/unit/data/functions/fods/dproduct.fods @@ -0,0 +1,1515 @@ + + +http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:form x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> + 2016-05-22T07:55:22.797656367P0D1LibreOfficeDev/5.2.0.0.alpha1$Linux_X86_64 LibreOffice_project/eb7593daa4bac21bd68182c8bbbd3ee3bd7b64dd + + + 0 + 0 + 22009 + 4261 + + + view1 + + + 2 + 17 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + 4 + 4 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + Sheet2 + 1241 + 0 + 100 + 60 + false + true + true + true + 12632256 + true + true + true + true + false + false + false + 1270 + 1270 + 1 + 1 + true + + + + + 7 + false + false + true + true + false + false + false + 1270 + 1270 + true + true + true + true + true + false + 12632256 + false + Lexmark-E352dn + + + en + US + + + + + + true + true + 3 + 1 + true + 1 + true + qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY= + false + 0 + + + + + http://openoffice.org/2004/office"; xmlns:xlink="http://www.w3.org/1999/xlink";> + + + + + + + + + + + + + + + + + + + + + + + + + KÄ + + + + - + + + KÄ + + + + £ + + + + - + £ + + + + + £ + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + + + + + ( + + ) + + + + + + + + ( + + ) + + + + £ + + + + + - + £ + + + + + + £ + + + + + - + £ + + + + + + +
[Libreoffice-commits] core.git: basctl/source basic/qa basic/source filter/source include/basic scripting/source sc/source sfx2/source vbahelper/source
basctl/source/basicide/baside2.cxx |2
basctl/source/basicide/baside2b.cxx |2
basctl/source/basicide/basides1.cxx |2
basctl/source/basicide/basobj2.cxx |2
basctl/source/basicide/basobj3.cxx |6 +-
basctl/source/basicide/bastype3.cxx |2
basctl/source/basicide/macrodlg.cxx |4 -
basic/qa/cppunit/basictest.cxx |2
basic/source/basmgr/basmgr.cxx | 10 +--
basic/source/classes/eventatt.cxx|6 +-
basic/source/classes/image.cxx |8 +-
basic/source/classes/sb.cxx | 38 ++---
basic/source/classes/sbunoobj.cxx| 22 +++
basic/source/classes/sbxmod.cxx | 48 -
basic/source/comp/dim.cxx| 20 +++
basic/source/comp/exprtree.cxx |2
basic/source/comp/parser.cxx |2
basic/source/runtime/methods.cxx |4 -
basic/source/runtime/methods1.cxx|4 -
basic/source/runtime/runtime.cxx | 30 +-
basic/source/runtime/stdobj.cxx | 16 ++---
basic/source/runtime/stdobj1.cxx | 32 +--
basic/source/sbx/sbxarray.cxx| 18 +++---
basic/source/sbx/sbxbase.cxx |2
basic/source/sbx/sbxcoll.cxx | 10 +--
basic/source/sbx/sbxexec.cxx |4 -
basic/source/sbx/sbxobj.cxx | 86 +++
basic/source/sbx/sbxvalue.cxx|2
basic/source/sbx/sbxvar.cxx |6 +-
filter/source/msfilter/msvbahelper.cxx |4 -
include/basic/sbxdef.hxx | 16 ++---
sc/source/core/data/validat.cxx |2
sc/source/core/tool/compiler.cxx |2
sc/source/core/tool/interpr4.cxx |2
sc/source/ui/vba/vbaapplication.cxx |4 -
sc/source/ui/vba/vbahelper.cxx |2
scripting/source/basprov/basprov.cxx |2
sfx2/source/view/viewfrm.cxx |2
vbahelper/source/vbahelper/vbahelper.cxx |2
39 files changed, 215 insertions(+), 215 deletions(-)
New commits:
commit f107d453819fe06e1e8d46ffb3cc866f119d74fd
Author: Noel Grandin
Date: Sat May 21 16:22:07 2016 +0200
Convert SbxClassType to scoped enum
Change-Id: I48afcdd9924d22b52a8db21aa253061e4d38c85b
Reviewed-on: https://gerrit.libreoffice.org/25259
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 9fcd5bd..a245c40 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -705,7 +705,7 @@ void ModulWindow::EditMacro( const OUString& rMacroName )
if ( !m_aStatus.bError )
{
sal_uInt16 nStart, nEnd;
-SbMethod* pMethod = static_cast(m_xModule->Find(
rMacroName, SbxCLASS_METHOD ));
+SbMethod* pMethod = static_cast(m_xModule->Find(
rMacroName, SbxClassType::Method ));
if ( pMethod )
{
pMethod->GetLineRange( nStart, nEnd );
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 2371342..c8bc435 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2240,7 +2240,7 @@ SbxBase* WatchTreeListBox::ImplGetSBXForEntry(
SvTreeListEntry* pEntry, bool& rb
SbxDimArray* pArray;
if( pObj )
{
-pSBX = pObj->Find( aVName, SbxCLASS_DONTCARE );
+pSBX = pObj->Find( aVName, SbxClassType::DontCare );
if (SbxVariable const* pVar = IsSbxVariable(pSBX))
{
// Force getting value
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index 926c9ad..8dee9c8 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -314,7 +314,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
pModule = pBasic->GetModules().front();
}
DBG_ASSERT( pModule, "Kein Modul!" );
-if ( pModule && !pModule->GetMethods()->Find(
rInfo.GetMethod(), SbxCLASS_METHOD ) )
+if ( pModule && !pModule->GetMethods()->Find(
rInfo.GetMethod(), SbxClassType::Method ) )
CreateMacro( pModule, rInfo.GetMethod() );
}
SfxViewFrame* pViewFrame = GetViewFrame();
diff --git a/basctl/source/basicide/basobj2.cxx
b/basctl/source/basicide/basobj2.cxx
index c737227..29d9824 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -439,7 +439,7 @@ bool HasMethod (
SbxArray* pMethods = pMod->GetMethods();
if ( pMethods )
{
-SbMethod* pMethod = static_cast(pMethods->Find(
rMethName, SbxCLASS_METHOD ));
+SbMethod* pMethod = static_cast(pMethods->Find(
rMethName, SbxClassType::Method
[Libreoffice-commits] core.git: sd/source
sd/source/ui/sidebar/SlideBackground.cxx | 106 ---
sd/source/ui/sidebar/SlideBackground.hxx |6 +
2 files changed, 90 insertions(+), 22 deletions(-)
New commits:
commit 833088b18015381dc8f90e4e868f96b7e882334f
Author: Susobhan Ghosh
Date: Thu May 12 17:06:23 2016 +0530
tdf#89466 Fix update of elements and add listener in slidebg
Handle Slide change event, removal of PaperOrientationModifyHdlâ
Fixed sync and update of MasterSlides. Fixed Paper orientation.
Change-Id: I63ece7a4717f216f897b265664758c2c14abb191
Reviewed-on: https://gerrit.libreoffice.org/24927
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index a772766..ed200e2 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -33,6 +33,7 @@
#include "DrawViewShell.hxx"
#include "DrawController.hxx"
#include
+#include
#include "sdresid.hxx"
#include
#include
@@ -59,6 +60,7 @@
#include
#include
#include
+#include "EventMultiplexer.hxx"
using namespace ::com::sun::star;
@@ -147,6 +149,7 @@ SlideBackground::SlideBackground(
get(mpFillLB, "fillattr");
get(mpDspMasterBackground, "displaymasterbackground");
get(mpDspMasterObjects, "displaymasterobjects");
+addListener();
Initialize();
}
@@ -159,21 +162,9 @@ void SlideBackground::Initialize()
{
lcl_FillPaperSizeListbox( *mpPaperSizeBox );
mpPaperSizeBox->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl));
-
mpPaperOrientation->SetSelectHdl(LINK(this,SlideBackground,PaperOrientationModifyHdl));
+
mpPaperOrientation->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl));
-::sd::DrawDocShell* pDocSh = dynamic_cast<::sd::DrawDocShell*>(
SfxObjectShell::Current() );
-SdDrawDocument* pDoc = pDocSh ? pDocSh->GetDoc() : nullptr;
-sal_uInt16 nCount = pDoc ? pDoc->GetMasterPageCount() : 0;
-for( sal_uInt16 nLayout = 0; nLayout < nCount; nLayout++ )
-{
-SdPage* pMaster = static_cast(pDoc->GetMasterPage(nLayout));
-if( pMaster->GetPageKind() == PK_STANDARD)
-{
-OUString aLayoutName(pMaster->GetLayoutName());
-aLayoutName =
aLayoutName.copy(0,aLayoutName.indexOf(SD_LT_SEPARATOR));
-mpMasterSlide->InsertEntry(aLayoutName);
-}
-}
+populateMasterSlideDropdown();
meUnit = maPaperSizeController.GetCoreMetric();
@@ -294,8 +285,87 @@ void SlideBackground::Update()
}
}
+void SlideBackground::addListener()
+{
+Link aLink( LINK(this,
SlideBackground, EventMultiplexerListener) );
+mrBase.GetEventMultiplexer()->AddEventListener (
+aLink,
+tools::EventMultiplexerEvent::EID_CURRENT_PAGE |
+tools::EventMultiplexerEvent::EID_SHAPE_CHANGED );
+}
+
+void SlideBackground::removeListener()
+{
+Link aLink( LINK(this,
SlideBackground, EventMultiplexerListener) );
+mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
+}
+
+IMPL_LINK_TYPED(SlideBackground, EventMultiplexerListener,
+tools::EventMultiplexerEvent&, rEvent, void)
+{
+switch (rEvent.meEventId)
+{
+// add more events as per requirement
+// Master Page change triggers a shape change event. Solves sync
problem.
+case tools::EventMultiplexerEvent::EID_SHAPE_CHANGED:
+populateMasterSlideDropdown();
+break;
+case tools::EventMultiplexerEvent::EID_CURRENT_PAGE:
+{
+static sal_uInt16 SidArray[] = {
+SID_ATTR_PAGE_COLOR,
+SID_ATTR_PAGE_HATCH,
+SID_ATTR_PAGE_BITMAP,
+SID_ATTR_PAGE_GRADIENT,
+SID_ATTR_PAGE_FILLSTYLE,
+SID_DISPLAY_MASTER_BACKGROUND,
+SID_DISPLAY_MASTER_OBJECTS,
+0 };
+updateMasterSlideSelection();
+GetBindings()->Invalidate( SidArray );
+}
+break;
+default:
+break;
+}
+}
+
+void SlideBackground::populateMasterSlideDropdown()
+{
+mpMasterSlide->Clear();
+::sd::DrawDocShell* pDocSh = dynamic_cast<::sd::DrawDocShell*>(
SfxObjectShell::Current() );
+SdDrawDocument* pDoc = pDocSh ? pDocSh->GetDoc() : nullptr;
+sal_uInt16 nCount = pDoc ? pDoc->GetMasterPageCount() : 0;
+for( sal_uInt16 nLayout = 0; nLayout < nCount; nLayout++ )
+{
+SdPage* pMaster = static_cast(pDoc->GetMasterPage(nLayout));
+if( pMaster->GetPageKind() == PK_STANDARD)
+{
+OUString aLayoutName(pMaster->GetLayoutName());
+aLayoutName =
aLayoutName.copy(0,aLayoutName.indexOf(SD_LT_SEPARATOR));
+mpMasterSlide->InsertEntry(aLayoutName);
+}
+}
+updateMasterSlideSelection();
+}
+
+void SlideBackground::updateMasterSlideSelection()
+{
+SdPage* pPage = mrBase.GetMa
[Libreoffice-commits] online.git: loleaflet/po
loleaflet/po/help-hu.po | 14 +- loleaflet/po/help-sl.po | 14 +- loleaflet/po/ui-fr.po | 306 --- loleaflet/po/ui-hu.po | 336 +++- loleaflet/po/ui-sl.po | 336 +++- 5 files changed, 579 insertions(+), 427 deletions(-) New commits: commit b5ce034fde18a8e6ba00bf6418e5a981cc5b0c39 Author: Andras Timar Date: Mon May 23 13:32:01 2016 +0200 loleaflet: update translations (test) diff --git a/loleaflet/po/help-hu.po b/loleaflet/po/help-hu.po index 8c99705..fc24fde 100644 --- a/loleaflet/po/help-hu.po +++ b/loleaflet/po/help-hu.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: LoLeaflet Help\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-29 15:41+0200\n" +"POT-Creation-Date: 2016-05-23 13:29+0200\n" "PO-Revision-Date: 2016-01-10 22:10+0100\n" "Last-Translator: Andras Timar \n" "Language-Team: Hungarian \n" @@ -911,6 +911,18 @@ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:166" msgid "Ctrl + D" msgstr "Ctrl + D" +#: dist/loleaflet-help.html+html.body.div.table.tr.td:167 +#, fuzzy +msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:167" +msgid "Select All" +msgstr "Mindent kijelöl" + +#: dist/loleaflet-help.html+html.body.div.table.tr.td:167 +#, fuzzy +msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:167" +msgid "Ctrl + A" +msgstr "Ctrl + A" + #: dist/loleaflet-help.html+html.body.div.table.tr.td:168 msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:168" msgid "Align Center" diff --git a/loleaflet/po/help-sl.po b/loleaflet/po/help-sl.po index af5523a..6085142 100644 --- a/loleaflet/po/help-sl.po +++ b/loleaflet/po/help-sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice Online - Help\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-29 15:41+0200\n" +"POT-Creation-Date: 2016-05-23 13:29+0200\n" "PO-Revision-Date: 2016-03-10 00:44+0100\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org \n" @@ -914,6 +914,18 @@ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:166" msgid "Ctrl + D" msgstr "Krmilka + D" +#: dist/loleaflet-help.html+html.body.div.table.tr.td:167 +#, fuzzy +msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:167" +msgid "Select All" +msgstr "Izberi vse" + +#: dist/loleaflet-help.html+html.body.div.table.tr.td:167 +#, fuzzy +msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:167" +msgid "Ctrl + A" +msgstr "Krmilka + A" + #: dist/loleaflet-help.html+html.body.div.table.tr.td:168 msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:168" msgid "Align Center" diff --git a/loleaflet/po/ui-fr.po b/loleaflet/po/ui-fr.po index 947ebc9..230fc1a 100644 --- a/loleaflet/po/ui-fr.po +++ b/loleaflet/po/ui-fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: LoLeaflet Toolbar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-29 15:41+0200\n" +"POT-Creation-Date: 2016-05-23 13:29+0200\n" "PO-Revision-Date: 2015-12-20 14:14+0100\n" "Last-Translator: Andras Timar \n" "Language-Team: French \n" @@ -17,301 +17,333 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.4\n" -#: dist/toolbar/toolbar.js:21 dist/toolbar/toolbar.js:29 -#: dist/toolbar/toolbar.js:37 dist/toolbar/toolbar.js:45 -msgid "File" -msgstr "Fichier" - -#: dist/toolbar/toolbar.js:22 dist/toolbar/toolbar.js:30 -#: dist/toolbar/toolbar.js:38 dist/toolbar/toolbar.js:46 -msgid "Download as PDF document (.pdf)" -msgstr "Télécharger en PDF (.pdf)" - -#: dist/toolbar/toolbar.js:23 -msgid "Download as ODF Text document (.odt)" -msgstr "Télécharger en ODF Document texte (.odt)" - -#: dist/toolbar/toolbar.js:24 -msgid "Download as Microsoft Word 2003 (.doc)" -msgstr "Télécharger en Microsoft Word 2003 (.doc)" - -#: dist/toolbar/toolbar.js:25 -msgid "Download as Microsoft Word (.docx)" -msgstr "Télécharger en Microsoft Word (.docx)" - -#: dist/toolbar/toolbar.js:26 dist/toolbar/toolbar.js:34 -#: dist/toolbar/toolbar.js:42 dist/toolbar/toolbar.js:47 -msgid "Print" -msgstr "Impression" - -#: dist/toolbar/toolbar.js:31 -msgid "Download as ODF Presentation (.odp)" -msgstr "Download as ODF Présentation (.odp)" - -#: dist/toolbar/toolbar.js:32 -msgid "Download as Microsoft Powerpoint 2003 (.ppt)" -msgstr "Télécharger en Microsoft Powerpoint 2003 (.ppt)" - -#: dist/toolbar/toolbar.js:33 -msgid "Download as Microsoft Powerpoint (.pptx)" -msgstr "Télécharger en Microsoft Powerpoint (.pptx)" - -#: dist/toolbar/toolbar.js:39 -msgid "Download as ODF Spreadsheet (.ods)" -msgstr "Télécharger en ODF Classeur (.ods)" - -#: dist/toolbar/toolbar.js:40 -msgid "Download as Microsoft Excel 2003 (.xls)" -msgstr "Télécharger en Microsoft Excel 2003 (.xls)" - -#: dist/toolbar/toolbar.js:41 -msgid "Download as Microsoft Excel (.xlsx)" -msgstr "Télécharger en Microsoft Excel (.xlsx)" - -#: dist/t
[Libreoffice-commits] core.git: cui/source
cui/source/inc/optpath.hxx |2 +-
cui/source/options/optpath.cxx |9 -
2 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 00271c8eaf77c453a403a85f23233dca71d834f3
Author: Xisco Fauli
Date: Mon May 23 01:48:37 2016 +0200
tdf#89329: use unique_ptr for pImpl in optpath
Change-Id: If9e627e2f0f091e8411d0c6f16f29b583723419a
Reviewed-on: https://gerrit.libreoffice.org/25327
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 8671e3f..790da15 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -46,7 +46,7 @@ private:
VclPtr m_pPathBtn;
VclPtr pPathBox;
-OptPath_Impl* pImpl;
+std::unique_ptr pImpl;
css::uno::Reference< ::svt::DialogClosedListener > xDialogListener;
css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker;
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 2b84c1f..2a52540 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -191,11 +191,11 @@ bool IsMultiPath_Impl( const sal_uInt16 nIndex )
// class SvxPathTabPage --
SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
-:SfxTabPage( pParent, "OptPathsPage", "cui/ui/optpathspage.ui", &rSet)
+: SfxTabPage( pParent, "OptPathsPage", "cui/ui/optpathspage.ui", &rSet)
+, pImpl( new OptPath_Impl(get("lock")->GetImage(),
+get("editpaths")->GetText()) )
, xDialogListener ( new ::svt::DialogClosedListener() )
{
-pImpl = new OptPath_Impl(get("lock")->GetImage(),
-get("editpaths")->GetText());
get(m_pStandardBtn, "default");
get(m_pPathBtn, "edit");
get(m_pPathCtrl, "paths");
@@ -251,8 +251,7 @@ void SvxPathTabPage::dispose()
delete
static_cast(pPathBox->GetEntry(i)->GetUserData());
pPathBox.disposeAndClear();
}
-delete pImpl;
-pImpl = nullptr;
+pImpl.reset();
m_pPathCtrl.clear();
m_pStandardBtn.clear();
m_pPathBtn.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/dispatch/interceptionhelper.cxx | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 08cf2fd01064306eef7fdbb5b62320947c4d1089
Author: Thorsten Behrens
Date: Fri May 20 16:48:00 2016 +0200
framework: last dispatchInterceptor gets asked first
Align implementation with API contract as spelled out in
offapi/com/sun/star/frame/XDispatchProviderInterception.idl -
no idea why this change happenend in 2003:
Date: Fri Apr 4 16:16:05 2003 +
INTEGRATION: CWS fwk01 (1.1.72); FILE MERGED
2003/04/01 12:40:09 as 1.1.72.1: #107642# change order of used interception
objects
At any rate, with this change extensions actually get a chance to
see dispatch requests first, and process/ignore at will.
Change-Id: I58876150ee6d67e592f41b3e82a9ffc314e091a3
Reviewed-on: https://gerrit.libreoffice.org/25215
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/framework/source/dispatch/interceptionhelper.cxx
b/framework/source/dispatch/interceptionhelper.cxx
index 9772e52..dfff234 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -136,20 +136,19 @@ void SAL_CALL
InterceptionHelper::registerDispatchProviderInterceptor(const css:
// b) OK - there is at least one interceptor already registered.
//It's slave and it's master must be valid references ...
-//because we created it. But we have to look for the static bool which
-//regulate direction of using of interceptor objects!
+//because we created it.
-// insert it behind any other existing interceptor - means at the end
of our list.
+// insert it before any other existing interceptor - means at the
beginning of our list.
else
{
-css::uno::Reference< css::frame::XDispatchProvider >
xMasterD = m_lInterceptionRegs.rbegin()->xInterceptor;
-css::uno::Reference< css::frame::XDispatchProviderInterceptor >
xMasterI (xMasterD, css::uno::UNO_QUERY);
+css::uno::Reference< css::frame::XDispatchProvider >
xSlaveD = m_lInterceptionRegs.begin()->xInterceptor;
+css::uno::Reference< css::frame::XDispatchProviderInterceptor >
xSlaveI (xSlaveD , css::uno::UNO_QUERY);
-xInterceptor->setMasterDispatchProvider(xMasterD );
-xInterceptor->setSlaveDispatchProvider (m_xSlave );
-xMasterI->setSlaveDispatchProvider (aInfo.xInterceptor);
+xInterceptor->setMasterDispatchProvider(xThis );
+xInterceptor->setSlaveDispatchProvider (xSlaveD );
+xSlaveI->setMasterDispatchProvider (aInfo.xInterceptor);
-m_lInterceptionRegs.push_back(aInfo);
+m_lInterceptionRegs.push_front(aInfo);
}
css::uno::Reference< css::frame::XFrame > xOwner(m_xOwnerWeak.get(),
css::uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/gfxlink.hxx| 98 ++-
vcl/source/gdi/gfxlink.cxx | 225 +
2 files changed, 95 insertions(+), 228 deletions(-)
New commits:
commit d64431ac5a7bede7661c64e0bd6d46805841e704
Author: Mark Page
Date: Wed May 18 08:33:33 2016 +0100
Simplify GfxLink using std::shared_ptr to clarify ownership
The functionality has not changed in this class, however the ABI
has changed (this class is DLL Public)
Change-Id: I11005f03e747d56cb59550e071755429390db7a7
Reviewed-on: https://gerrit.libreoffice.org/25081
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 3bdb4b7..aa0e8fe 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -25,56 +25,10 @@
#include
#include
#include
+#include
class SvStream;
-
-struct ImpBuffer
-{
-sal_uLong mnRefCount;
-sal_uInt8* mpBuffer;
-
-ImpBuffer( sal_uInt8* pBuf ) { mnRefCount = 1UL; mpBuffer =
pBuf; }
-
-~ImpBuffer() { delete[] mpBuffer; }
-};
-
-
-struct ImpSwap
-{
-OUString maURL;
-sal_uLong mnDataSize;
-sal_uLong mnRefCount;
-
-ImpSwap( sal_uInt8* pData, sal_uLong nDataSize );
-~ImpSwap();
-
-sal_uInt8* GetData() const;
-
-boolIsSwapped() const { return maURL.getLength() > 0; }
-
-voidWriteTo( SvStream& rOStm ) const;
-};
-
-
-struct ImpGfxLink
-{
-MapMode maPrefMapMode;
-SizemaPrefSize;
-boolmbPrefMapModeValid;
-boolmbPrefSizeValid;
-
-ImpGfxLink() :
-maPrefMapMode(),
-maPrefSize(),
-mbPrefMapModeValid( false ),
-mbPrefSizeValid( false )
-{}
-};
-
-//#endif // __PRIVATE
-
-
enum GfxLinkType
{
GFX_LINK_TYPE_NONE = 0,
@@ -88,7 +42,6 @@ enum GfxLinkType
GFX_LINK_TYPE_NATIVE_PCT= 8,// Don't forget to update the
following defines
GFX_LINK_TYPE_NATIVE_SVG= 9,// Don't forget to update the
following defines
GFX_LINK_TYPE_NATIVE_MOV= 10, // Don't forget to update the
following defines
-// #i15508# added BMP type support
GFX_LINK_TYPE_NATIVE_BMP= 11, // Don't forget to update the
following defines
GFX_LINK_TYPE_USER = 0x
};
@@ -96,49 +49,58 @@ enum GfxLinkType
#define GFX_LINK_FIRST_NATIVE_IDGFX_LINK_TYPE_NATIVE_GIF
#define GFX_LINK_LAST_NATIVE_ID GFX_LINK_TYPE_NATIVE_BMP
-
-struct ImpBuffer;
-struct ImpSwap;
-struct ImpGfxLink;
class Graphic;
class VCL_DLLPUBLIC GfxLink
{
private:
-GfxLinkType meType;
-ImpBuffer* mpBuf;
-ImpSwap*mpSwap;
-sal_uInt32 mnBufSize;
-sal_uInt32 mnUserId;
-ImpGfxLink* mpImpData;
+struct SwapOutData
+{
+SwapOutData(const OUString &aURL);
+~SwapOutData();
-SAL_DLLPRIVATE void ImplCopy( const GfxLink& rGfxLink );
+OUString maURL; // File is removed in the destructor
+};
+
+GfxLinkType meType = GFX_LINK_TYPE_NONE;
+sal_uInt32 mnUserId = 0;
+
+std::shared_ptr mpSwapInData;
+std::shared_ptr mpSwapOutData;
+
+sal_uInt32 mnSwapInDataSize = 0;
+MapMode maPrefMapMode;
+SizemaPrefSize;
+boolmbPrefMapModeValid = false;
+boolmbPrefSizeValid = false;
+
+SAL_DLLPRIVATE std::shared_ptr GetSwapInData() const;
public:
GfxLink();
-GfxLink( const GfxLink& );
+
+// pBuff = The Graphic data. This class takes
ownership of this
GfxLink( sal_uInt8* pBuf, sal_uInt32 nBufSize,
GfxLinkType nType );
~GfxLink();
-GfxLink&operator=( const GfxLink& );
-boolIsEqual( const GfxLink& ) const;
+boolIsEqual( const GfxLink& ) const;
GfxLinkType GetType() const { return meType;}
voidSetUserId( sal_uInt32 nUserId ) { mnUserId = nUserId; }
sal_uInt32 GetUserId() const { return mnUserId; }
-sal_uInt32 GetDataSize() const { return mnBufSize;}
+sal_uInt32 GetDataSize() const { return mnSwapInDataSize;}
const sal_uInt8*GetData() const;
-const Size& GetPrefSize() const { return mpImpData->maPrefSize;}
+const Size& GetPrefSize() const { return maPrefSize;}
voidSetPrefSize( const Size& rPrefSize );
-boolIsPrefSizeValid() { return mpImpData->mbPrefSizeValid;}
+boolIsPrefSizeValid() { return mbPrefSizeValid;}
-const MapMode& GetPrefMapMode() const { return
mpImpData->maPrefMapMode;}
+const MapMode& GetPrefMapMode() const { return maPrefMapMode;}
v
[Libreoffice-commits] online.git: loleaflet/Makefile
loleaflet/Makefile |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 1af287e437cc61d6563bc9cec890e343e0010c91 Author: Andras Timar Date: Mon May 23 13:29:16 2016 +0200 loleaflet: add --from-code=UTF-8 to xgettext call diff --git a/loleaflet/Makefile b/loleaflet/Makefile index 99d685d..d1cd094 100644 --- a/loleaflet/Makefile +++ b/loleaflet/Makefile @@ -28,7 +28,9 @@ dist: all rm -rf loleaflet-$(VERSION) pot: - xgettext --keyword=_ --output=po/loleaflet-ui.pot dist/toolbar/toolbar.js src/control/Control.Tabs.js \ + xgettext --from-code=UTF-8 --keyword=_ --output=po/loleaflet-ui.pot \ + dist/toolbar/toolbar.js \ + src/control/Control.Tabs.js \ src/core/Socket.js html2po --pot --input=dist/loleaflet-help.html --output=po/loleaflet-help.pot ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
