[Libreoffice-commits] core.git: accessibility/inc accessibility/source chart2/source compilerplugins/clang cui/source dbaccess/source editeng/source fpicker/source framework/inc framework/source helpc
accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx |1 accessibility/source/extended/accessibletabbarpagelist.cxx| 18 -- chart2/source/controller/inc/dlg_DataEditor.hxx |2 compilerplugins/clang/unusedmethods.py| 49 + cui/source/inc/cuigaldlg.hxx |2 cui/source/inc/macroass.hxx |1 dbaccess/source/core/api/OptimisticSet.hxx|3 dbaccess/source/core/api/RowSetBase.hxx |2 dbaccess/source/core/api/RowSetCache.hxx |4 dbaccess/source/core/api/RowSetCacheIterator.hxx |1 dbaccess/source/core/dataaccess/ModelImpl.hxx |5 dbaccess/source/core/dataaccess/bookmarkcontainer.cxx | 11 - dbaccess/source/core/dataaccess/bookmarkcontainer.hxx |6 dbaccess/source/core/dataaccess/datasource.hxx|2 dbaccess/source/core/dataaccess/documentdefinition.cxx|1 dbaccess/source/core/dataaccess/documentdefinition.hxx| 18 -- dbaccess/source/core/inc/TableDeco.hxx|1 editeng/source/editeng/editeng.cxx|5 fpicker/source/office/RemoteFilesDialog.cxx | 22 -- fpicker/source/office/RemoteFilesDialog.hxx |3 fpicker/source/office/fpsmartcontent.hxx | 10 - framework/inc/classes/filtercachedata.hxx | 63 --- framework/inc/classes/wildcard.hxx| 14 - framework/inc/protocols.h | 42 - framework/inc/queries.h | 11 - framework/inc/uielement/spinfieldtoolbarcontroller.hxx|2 framework/inc/uielement/uicommanddescription.hxx |6 framework/source/inc/pattern/window.hxx | 50 -- framework/source/uiconfiguration/imagemanagerimpl.cxx | 11 - framework/source/uiconfiguration/imagemanagerimpl.hxx |8 framework/source/uiconfiguration/uicategorydescription.cxx|6 framework/source/uielement/spinfieldtoolbarcontroller.cxx |5 framework/source/uielement/uicommanddescription.cxx |4 helpcompiler/inc/HelpCompiler.hxx |9 - hwpfilter/source/hpara.h |8 idl/inc/basobj.hxx|7 idl/inc/bastype.hxx |3 idl/inc/database.hxx | 18 -- idl/inc/hash.hxx |1 idl/inc/lex.hxx | 18 -- idl/inc/module.hxx| 13 - idl/inc/object.hxx| 12 - idl/inc/slot.hxx | 27 --- idl/inc/types.hxx | 24 -- idlc/inc/idlc/astdeclaration.hxx |6 idlc/inc/idlc/astenum.hxx |2 idlc/inc/idlc/astexpression.hxx | 26 --- idlc/inc/idlc/astinterface.hxx| 11 - idlc/inc/idlc/astoperation.hxx|2 idlc/inc/idlc/astscope.hxx|1 idlc/inc/idlc/aststruct.hxx |3 idlc/inc/idlc/fehelper.hxx|6 idlc/inc/idlc/idlc.hxx|8 idlc/source/astinterface.cxx |2 include/editeng/editeng.hxx |2 include/formula/token.hxx |3 include/i18nutil/unicode.hxx |5 include/registry/registry.hxx | 18 -- include/sot/factory.hxx |6 include/sot/stg.hxx |5 include/svtools/brwbox.hxx|2 include/svtools/editbrowsebox.hxx |2 include/svx/EnhancedCustomShape2d.hxx
[Libreoffice-commits] core.git: pyuno/Library_pyuno.mk pyuno/source
pyuno/Library_pyuno.mk|1
pyuno/source/module/pyuno.cxx | 111 +
pyuno/source/module/pyuno_impl.hxx|9
pyuno/source/module/pyuno_module.cxx |4
pyuno/source/module/pyuno_runtime.cxx | 34 +-
pyuno/source/module/pyuno_struct.cxx | 393 ++
6 files changed, 438 insertions(+), 114 deletions(-)
New commits:
commit 2387c2a46e15995686d28dccdfd455012072b4cf
Author: Matthew J. Francis
Date: Wed Jul 29 15:22:54 2015 +0800
Give PyUNO structs/exceptions their own separate type
Change-Id: Ie4c42c623fae1cf39c2e4c643825c9655cd28daa
Reviewed-on: https://gerrit.libreoffice.org/17410
Tested-by: Jenkins
Reviewed-by: Matthew Francis
diff --git a/pyuno/Library_pyuno.mk b/pyuno/Library_pyuno.mk
index 3bf08cc..49c5b91 100644
--- a/pyuno/Library_pyuno.mk
+++ b/pyuno/Library_pyuno.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_externals,pyuno,\
$(eval $(call gb_Library_add_exception_objects,pyuno,\
pyuno/source/module/pyuno_runtime \
pyuno/source/module/pyuno \
+pyuno/source/module/pyuno_struct \
pyuno/source/module/pyuno_callable \
pyuno/source/module/pyuno_module \
pyuno/source/module/pyuno_type \
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index ccab344..9e9274ab 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -376,26 +376,7 @@ bool lcl_hasInterfaceByName( Any const &object, OUString
const & interfaceName )
PyObject *PyUNO_repr( PyObject * self )
{
-PyUNO *me = reinterpret_cast(self);
-PyObject * ret = 0;
-
-if( me->members->wrappedObject.getValueType().getTypeClass()
-== com::sun::star::uno::TypeClass_EXCEPTION )
-{
-Reference< XMaterialHolder >
rHolder(me->members->xInvocation,UNO_QUERY);
-if( rHolder.is() )
-{
-Any a = rHolder->getMaterial();
-Exception e;
-a >>= e;
-ret = ustring2PyUnicode(e.Message ).getAcquired();
-}
-}
-else
-{
-ret = PyUNO_str( self );
-}
-return ret;
+return PyUNO_str( self );
}
Py_hash_t PyUNO_hash( PyObject *self )
@@ -405,20 +386,8 @@ Py_hash_t PyUNO_hash( PyObject *self )
// Py_hash_t is not necessarily the same size as a pointer, but this is not
// important for hashing - it just has to return the same value each time
-if( me->members->wrappedObject.getValueType().getTypeClass()
-== com::sun::star::uno::TypeClass_STRUCT ||
-me->members->wrappedObject.getValueType().getTypeClass()
-== com::sun::star::uno::TypeClass_EXCEPTION )
-{
-Reference< XMaterialHolder > xMe( me->members->xInvocation, UNO_QUERY
);
-return sal::static_int_cast< Py_hash_t >( reinterpret_cast< sal_IntPtr
> (
-*static_cast(xMe->getMaterial().getValue()) ) );
-}
-else
-{
-return sal::static_int_cast< Py_hash_t >( reinterpret_cast< sal_IntPtr
> (
-*static_cast(me->members->wrappedObject.getValue()) ) );
-}
+return sal::static_int_cast< Py_hash_t >( reinterpret_cast< sal_IntPtr > (
+*static_cast(me->members->wrappedObject.getValue()) )
);
}
@@ -501,24 +470,7 @@ PyObject *PyUNO_str( PyObject * self )
OStringBuffer buf;
-
-if( me->members->wrappedObject.getValueType().getTypeClass()
-== com::sun::star::uno::TypeClass_STRUCT ||
-me->members->wrappedObject.getValueType().getTypeClass()
-== com::sun::star::uno::TypeClass_EXCEPTION)
-{
-Reference< XMaterialHolder >
rHolder(me->members->xInvocation,UNO_QUERY);
-if( rHolder.is() )
-{
-PyThreadDetach antiguard;
-Any a = rHolder->getMaterial();
-OUString s = val2str( a.getValue(),
a.getValueType().getTypeLibType() );
-buf.append( OUStringToOString(s,RTL_TEXTENCODING_ASCII_US) );
-}
-}
-else
{
-// a common UNO object
PyThreadDetach antiguard;
buf.append( "pyuno object " );
@@ -527,7 +479,7 @@ PyObject *PyUNO_str( PyObject * self )
buf.append( OUStringToOString(s,RTL_TEXTENCODING_ASCII_US) );
}
-return PyStr_FromString( buf.getStr());
+return PyStr_FromString( buf.getStr() );
}
PyObject* PyUNO_dir (PyObject* self)
@@ -1447,18 +1399,15 @@ PyObject* PyUNO_getattr (PyObject* self, char* name)
}
if (strcmp (name, "__class__") == 0)
{
-if( me->members->wrappedObject.getValueTypeClass() ==
-com::sun::star::uno::TypeClass_STRUCT ||
-me->members->wrappedObject.getValueTypeClass() ==
-com::sun::star::uno::TypeClass_EXCEPTION )
-{
-return getClass(
-me->members->wrappedObject.getValueType().getTypeName(),
runtime ).getAcquired();
-}
Py_INCREF (Py_None);
retur
[Bug 38837] Reduce power consumption: timers must end eventually
https://bugs.documentfoundation.org/show_bug.cgi?id=38837 Jean-Baptiste Faure changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=91 ||870 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 9 commits - chart2/Library_chartcontroller.mk chart2/source include/sfx2 include/svx sfx2/source svx/Library_svx.mk svx/source
chart2/Library_chartcontroller.mk |1
chart2/source/controller/main/ChartController.cxx |2
chart2/source/controller/sidebar/Chart2PanelFactory.cxx |3
chart2/source/controller/sidebar/ChartLinePanel.cxx | 295 +
chart2/source/controller/sidebar/ChartLinePanel.hxx | 104 +
chart2/source/model/main/DataPointProperties.cxx| 20
chart2/source/view/axes/VCartesianAxis.cxx |2
chart2/source/view/axes/VPolarAngleAxis.cxx |2
chart2/source/view/inc/PropertyMapper.hxx |3
chart2/source/view/main/PropertyMapper.cxx |5
include/sfx2/sidebar/EnumContext.hxx|1
include/svx/drawitem.hxx| 26
include/svx/sidebar/LinePropertyPanelBase.hxx | 175 +++
include/svx/sidebar/LineWidthPopup.hxx | 50
include/svx/xtable.hxx | 52
sfx2/source/sidebar/EnumContext.cxx |1
svx/Library_svx.mk |1
svx/source/sidebar/line/LinePropertyPanel.cxx | 841 --
svx/source/sidebar/line/LinePropertyPanel.hxx | 80 -
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 933
svx/source/sidebar/line/LineWidthControl.cxx| 12
svx/source/sidebar/line/LineWidthControl.hxx|7
svx/source/sidebar/line/LineWidthPopup.cxx |5
svx/source/sidebar/line/LineWidthPopup.hxx | 50
24 files changed, 1656 insertions(+), 1015 deletions(-)
New commits:
commit 902255645328efde34ddf62227c8278e8dd61ff0
Author: Markus Mohrhard
Date: Thu Jul 30 00:03:58 2015 +0200
small fix to reduce UnknownPropertyException in chart2
accidently introduced with f1531cdaaebe706d909dc6ddde439ccb5f4ad36d
Change-Id: I292097c5f61ecb32a28a90e9f5be48fcfd6bcd7b
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index 66a7b29..6f316e3 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -321,6 +321,8 @@ OUString ChartController::GetContextName()
return OUString("ErrorBar");
case OBJECTTYPE_AXIS:
return OUString("Axis");
+case OBJECTTYPE_GRID:
+return OUString("Grid");
default:
break;
}
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index fd48b5c..ba2c452 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -404,7 +404,7 @@ void getAxisLabelProperties(
Reference xProps(rAxisProp.m_xAxisModel,
uno::UNO_QUERY);
PropertyMapper::getTextLabelMultiPropertyLists(
-xProps, rPropNames, rPropValues, false, nLimitedSpaceForText,
bLimitedHeight);
+xProps, rPropNames, rPropValues, false, nLimitedSpaceForText,
bLimitedHeight, false);
LabelPositionHelper::doDynamicFontResize(
rPropValues, rPropNames, xProps, rAxisLabelProp.m_aFontReferenceSize);
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx
b/chart2/source/view/axes/VPolarAngleAxis.cxx
index adbf8e6..d720868 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -66,7 +66,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis(
tAnySequence aPropValues;
uno::Reference< beans::XPropertySet > xProps(
m_aAxisProperties.m_xAxisModel, uno::UNO_QUERY );
-PropertyMapper::getTextLabelMultiPropertyLists( xProps, aPropNames,
aPropValues, false );
+PropertyMapper::getTextLabelMultiPropertyLists( xProps, aPropNames,
aPropValues, false, -1, false, false );
LabelPositionHelper::doDynamicFontResize( aPropValues, aPropNames, xProps
, rAxisLabelProperties.m_aFontReferenceSize );
diff --git a/chart2/source/view/inc/PropertyMapper.hxx
b/chart2/source/view/inc/PropertyMapper.hxx
index c1c29b7..171e302 100644
--- a/chart2/source/view/inc/PropertyMapper.hxx
+++ b/chart2/source/view/inc/PropertyMapper.hxx
@@ -123,7 +123,8 @@ public:
, tNameSequence& rPropNames, tAnySequence& rPropValues
, bool bName=true
, sal_Int32 nLimitedSpace=-1
-, bool bLimitedHeight=false );
+, bool bLimitedHeight=false
+, bool bSupportsLabelBorder = true);
/** adds line-, fill- and character properties and sets some suitable
defaults for auto-grow properties
diff --git a/chart2/source/view/main/PropertyMapper.cxx
b/chart2/source/view/main/PropertyMapper.cxx
index c373f38..313c237 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -435,11 +435,12 @@ void PropertyMapper::getTextLabelMultiPropertyLis
Re: Patch: Fix bug 90222 - Replace ScaList with std container
On Wednesday, July 29, 2015 03:27:07 PM Eike Rathke wrote: > On Wednesday, 2015-07-29 22:45:18 +1200, Ryan McCoskrie wrote: > > (I'm having trouble with logerrit) > > That is why? We much prefer patches on gerrit, it eases review and > handling a lot. Using git review might also be an option for you. If for > some reason you *have* to use mail attachments, please use git > format-patch to generate the patch to be attached, which preserves > author and date and commit message, or even use the git send-email > command. > I use gerrit last year successfully but at the moment it's rejecting my public key. I'm working on that though. > [Various technical notes] Thanks for the feed back. Hopefully my next contribution won't be such a mess. > Last but not least: > > Apparently we don't have your license statement on file, could you > please send us a blanket statement that you contribute all your past and > future patches under the MPLv2 and LGPLv3+ licenses? Best on the dev > mailing list libreoffice@lists.freedesktop.org so we can link to it from > https://wiki.documentfoundation.org/Development/Developers > > Something like this does nicely: > > All of my past & future contributions to LibreOffice may be > licensed under the MPLv2/LGPLv3+ dual license. > > Best use Subject: license statement > I've already done that. http://lists.freedesktop.org/archives/libreoffice/2014-September/063297.html -- Ryan McCoskrie North Canterbury, New Zealand ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - solenv/gdb sw/inc sw/source
solenv/gdb/boost/ptr_container.py |8
solenv/gdb/boost/unordered.py |4 ++--
sw/inc/poolfmt.hxx |5 +
sw/source/core/doc/DocumentStylePoolManager.cxx |8
sw/source/core/undo/unattr.cxx |5 -
5 files changed, 19 insertions(+), 11 deletions(-)
New commits:
commit 37e936996acb4a8329fad2ec73a35f66be446e90
Author: Michael Stahl
Date: Wed Jul 29 23:59:43 2015 +0200
tdf#83223: sw: fix Undo of format change of conditional para style
SwUndoFormatAttr was simply missing a case for RES_CONDTXTFMTCOLL.
Handle it the same way as an oridnary paragraph style, which seems to
work for me.
Change-Id: Ib529beb1116633e4890d5b51df39da21de485db9
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 2ba9bb34..80d068c 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -204,6 +204,7 @@ bool SwUndoFormatAttr::IsFormatInDoc( SwDoc* pDoc )
switch ( m_nFormatWhich )
{
case RES_TXTFMTCOLL:
+case RES_CONDTXTFMTCOLL:
bFound = pDoc->GetTextFormatColls()->Contains( m_pFormat );
break;
@@ -301,7 +302,9 @@ void SwUndoFormatAttr::RepeatImpl(::sw::RepeatContext &
rContext)
}
break;
-case RES_TXTFMTCOLL: {
+case RES_TXTFMTCOLL:
+case RES_CONDTXTFMTCOLL:
+{
SwTextNode *const pNd =
rContext.GetRepeatPaM().GetNode().GetTextNode();
if( pNd ) {
commit fc805abce250f68e1d9848b1c127fa673f646715
Author: Michael Stahl
Date: Wed Jul 29 23:32:33 2015 +0200
sw: un-inline IsConditionalByPoolId
why rebuild half of sw to add a comment?
Change-Id: I72796a704aadc820004f519ed43cb54ba18f918a
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index b80e0ed..2bc91f4 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -401,10 +401,7 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId );
SvxFrameDirection GetDefaultFrameDirection(sal_uLong nLanguage);
-inline bool IsConditionalByPoolId(sal_uInt16 nId)
-{
-return RES_POOLCOLL_TEXT == nId;
-}
+bool IsConditionalByPoolId(sal_uInt16 nId);
#endif
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index e8d4b64..d06574e 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -67,6 +67,14 @@
using namespace ::editeng;
using namespace ::com::sun::star;
+bool IsConditionalByPoolId(sal_uInt16 nId)
+{
+// TODO: why is this style conditional?
+// If it is changed to no longer be conditional, then a style "Text Body"
+// will be imported without its conditions from ODF.
+return RES_POOLCOLL_TEXT == nId;
+}
+
namespace
{
static const sal_uInt16 PT_3 = 3 * 20; // 3 pt
commit 396643d46a778539f2bde30569d35ec05d7d867b
Author: Michael Stahl
Date: Wed Jul 29 22:46:26 2015 +0200
gdb pretty printers for boost can't iterate with Python 3
Change-Id: Ie2d1cb7312de6f14a5c6de81eefd7a00be6f75c0
diff --git a/solenv/gdb/boost/ptr_container.py
b/solenv/gdb/boost/ptr_container.py
index 38f3b2f..425d812 100644
--- a/solenv/gdb/boost/ptr_container.py
+++ b/solenv/gdb/boost/ptr_container.py
@@ -70,7 +70,7 @@ class PtrStdPrinterBase(object):
return self
def __next__(self):
-(index, value) = self.impl.next()
+(index, value) = six.advance_iterator(self.impl)
return (index, value.cast(self.type).dereference())
def _import_std(self):
@@ -137,7 +137,7 @@ class PtrMapPrinter(PtrStdPrinterBase):
return self
def __next__(self):
-(index, value) = self.impl.next()
+(index, value) = six.advance_iterator(self.impl)
if self.key:
value = value.cast(self.key_type)
else:
@@ -190,7 +190,7 @@ class PtrUnorderedMapPrinter(PtrBoostPrinterBase):
def __next__(self):
if self.step:
-self.value = self.impl.next()
+self.value = six.advance_iterator(self.impl)
value = self.value[0]
else:
value = self.value[1].cast(self.value_type).dereference()
@@ -216,7 +216,7 @@ class PtrUnorderedSetPrinter(PtrBoostPrinterBase):
return self
def __next__(self):
-return ("",
self.impl.next()[1].cast(self.value_type).dereference())
+return ("",
six.advance_iterator(self.impl)[1].cast(self.value_type).dereference())
printer = None
diff --git a/solenv/gdb/boost/unordered.py b/solenv/gdb/boost/unordered.py
index c21d31a..2c56721 100644
--- a/solenv/gdb/boost/unordered.py
+++ b/solenv/gdb/boost/unordered.py
@@ -63,7 +63,7 @@ class UnorderedMapPrinter(PrinterBase):
def __next__(self):
if self.step:
-
Re: [GSoC15] Chained Text Boxes - Report Week 9
Matteo Campanelli wrote: > I'm sorry for the basic question but the next step for this is basically > pulling master+rebasing+pushing to master? > Yep, except for the pushing part - we really want to run this past gerrit CI first. ;) Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Text Chains in Draw] A few question on general handling of chains of text boxes
Matteo Campanelli wrote: > This part has been completed; also we can chain-links are set directly > after loading from file now. > Nice! > Thorsten, everything that worked already is working after setting > the UNO property but the solution is a bit dirty. Please see my last > chat message today. > To paste my answer (after spell-checking by mst): Look at include/svl/lstner.hxx for the listener interface, and SdrPaintView::Notify(), SdrPaintView::SetDefaultStyleSheet() for how to set yourself up for notifications and react on them. HTH, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 39468] translate German comments, removing redundant ones
https://bugs.documentfoundation.org/show_bug.cgi?id=39468 --- Comment #191 from Commit Notification --- Albert Thuswaldner committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=12047823544c13060966e5f422875a56d5e80727 tdf#39468 translated german comments in output.cxx and output2.cxx It will be available in 5.1.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/output.cxx | 32
sc/source/ui/view/output3.cxx |2 +-
2 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 12047823544c13060966e5f422875a56d5e80727
Author: Albert Thuswaldner
Date: Thu Jul 23 13:33:34 2015 +0200
tdf#39468 translated german comments in output.cxx and output2.cxx
Change-Id: I36f7e2ffa8868692b99c0a7d77692d25b82662d8
Reviewed-on: https://gerrit.libreoffice.org/17319
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index cef48f9..a84aa3b 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -389,7 +389,7 @@ void ScOutputData::DrawGrid(vcl::RenderContext&
rRenderContext, bool bGrid, bool
if ( bPage )
{
-// Seitenumbrueche auch in ausgeblendeten suchen
+// Search also in hidden part for page breaks
SCCOL nCol = nXplus1;
while (nCol <= MAXCOL)
{
@@ -1677,8 +1677,8 @@ void ScOutputData::DrawRotatedFrame(vcl::RenderContext&
rRenderContext, const Co
{
Polygon aPoly( 4, aPoints );
-// ohne Pen wird bei DrawPolygon rechts
und unten
-// ein Pixel weggelassen...
+// for DrawPolygon, whitout Pen one pixel
is left out
+// to the right and below...
if ( rColor.GetTransparency() == 0 )
rRenderContext.SetLineColor(rColor);
else
@@ -1693,8 +1693,8 @@ void ScOutputData::DrawRotatedFrame(vcl::RenderContext&
rRenderContext, const Co
Polygon aPoly( 4, aPoints );
const Color* pColor = pInfo->pColorScale.get();
-// ohne Pen wird bei DrawPolygon rechts und unten
-// ein Pixel weggelassen...
+// for DrawPolygon, whitout Pen one pixel is left
out
+// to the right and below...
if ( pColor->GetTransparency() == 0 )
rRenderContext.SetLineColor(*pColor);
else
@@ -1706,9 +1706,9 @@ void ScOutputData::DrawRotatedFrame(vcl::RenderContext&
rRenderContext, const Co
svx::frame::Style aTopLine, aBottomLine, aLeftLine,
aRightLine;
-if ( nX < nX1 || nX > nX2 ) // Attribute in
FillInfo nicht gesetzt
+if ( nX < nX1 || nX > nX2 ) // Attributes in
FillInfo not set
{
-//! Seitengrenzen fuer Druck beruecksichtigen !
+//! consider page borders for printing !
const ::editeng::SvxBorderLine* pLeftLine;
const ::editeng::SvxBorderLine* pTopLine;
const ::editeng::SvxBorderLine* pRightLine;
@@ -1794,10 +1794,10 @@ void ScOutputData::DrawRotatedFrame(vcl::RenderContext&
rRenderContext, const Co
nPosX += nColWidth * nLayoutSign;
}
-// erst hinterher im zweiten Schritt die Linien fuer normale
Ausgabe loeschen
+// delete the lines for normal output only afterwards in the
second step
nX = nX1 > 0 ? (nX1-1) : static_cast(0);
-for (; nX<=nX2+1; nX++) // sichtbarer Teil +- 1
+for (; nX<=nX2+1; nX++) // visible part +- 1
{
sal_uInt16 nArrX = nX + 1;
CellInfo& rInfo = rThisRowInfo.pCellInfo[nArrX];
@@ -1806,8 +1806,8 @@ void ScOutputData::DrawRotatedFrame(vcl::RenderContext&
rRenderContext, const Co
{
size_t nCol = lclGetArrayColFromCellInfoX( nArrX, nX1,
nX2, bLayoutRTL );
-// horizontal: angrenzende Linie verlaengern
-// (nur, wenn die gedrehte Zelle eine Umrandung hat)
+// horizontal: extend adjacent line
+// (only when the rotated cell has a border)
sal_uInt16 nDir = rInfo.nRotateDir;
if ( rArray.GetCellStyleTop( nCol, nRow ).Prim() )
{
@@ -2267,17 +2267,17 @@ void ScOutputData::DrawChangeTrack()
ScChangeTrack* pTrack = mpDoc->GetChangeTrack();
ScChangeViewSettings* pSettings = mpDoc->GetChangeViewSettings();
if ( !pTrack || !pTrack->GetFirst() || !pSettings ||
!pSettings->ShowChanges() )
-return; // nix da oder abgeschaltet
+return; // nothing there or hidden
ScActionColorChanger aCo
[GSoC] More and Better Tests - Weekly Report #9 (Varun Dhall)
Hi all! Ninth week of GSoC was passed in writing some new tests. Here are the changes made in last 7 days - https://gerrit.libreoffice.org/#/c/17284/ https://gerrit.libreoffice.org/#/c/17375/ These changes are successfully merged into the master. Currently I am working on a couple of tests and they will be merged soon. Last week I was not able to devote proper time as per my schedule, will try to cover pending tasks ASAP. Future Goals- Adding more and better unit tests in code-base to assist in finding regressions as early as possible. Regards, Varun Dhall ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC15] Chained Text Boxes - Report Week 9
Hi Thorsten, On Mon, Jul 27, 2015 at 1:58 PM, Thorsten Behrens < t...@documentfoundation.org> wrote: > > Hi Matteo, > > nice progress there again! As said earlier, let's now start getting > bits and pieces of that into master. Depending on your risk profile, > as an experimental feature, or w/o UI but enabled by default. ;) I'm sorry for the basic question but the next step for this is basically pulling master+rebasing+pushing to master? Matteo > > Cheers, > > -- Thorsten > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Minutes of the Design Hangout: 2015-07-29 [call canceled]
Hi, Just Mattias appeared in the first 15 minutes, so we canceled the call. Hopefully we'll have more people attending the next week! :-) [but it's vacation period, so...] All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Text Chains in Draw] A few question on general handling of chains of text boxes
This part has been completed; also we can chain-links are set directly after loading from file now. Thorsten, everything that worked already is working after setting the UNO property but the solution is a bit dirty. Please see my last chat message today. Matteo On Fri, Jul 24, 2015 at 12:14 AM Thorsten Behrens < t...@documentfoundation.org> wrote: > Matteo Campanelli wrote: > > *Question*: what is a good place to keep these chains in svx? > > They hold some kind of global information so my first guess would be > > SdrModel. Does that make sense? > > > Absolutely. > > > At some point it should be possible to specify next links from the UI. > > *Question*: where should one put such commands/methods (called from the > UI) > > for setting/removing links ? SdrTextObj-s themselves? > > > There, or as a binary op on the SdrModel again, with the two boxes > (upstream & downstream) as parameters. See what feels more natural > when calling it (SdrTextObj::setNextLink() or SdrModel::linkBoxes(up, > down))... > > HTH, > > -- Thorsten > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source
svx/source/svdraw/svdedxv.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit ba90284faa3fe85ad061ff72a9f9cca54ff8fb2d Author: matteocam Date: Wed Jul 29 19:12:07 2015 +0200 Check for links instead of chainabity when handling key input Change-Id: Id8a7892ab5465b85a79a4347a6653de8c975416c diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 9324ffd..02f7df0 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -543,6 +543,7 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent(TextChainCursorManager *pCu SdrTextObj* pTextObj = dynamic_cast(mxTextEditObj.get()); +// Check if it has links to move it to if (!pTextObj->IsChainable()) return; @@ -1288,7 +1289,7 @@ TextChainCursorManager *SdrObjEditView::ImpHandleMotionThroughBoxesKeyInput( else return NULL; -if (!pTextObj->IsChainable()) +if (!pTextObj->GetNextLinkInChain() && !pTextObj->GetPrevLinkInChain()) return NULL; TextChainCursorManager *pCursorManager = new TextChainCursorManager(this, pTextObj); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - svx/source
svx/source/svdraw/svdotext.cxx | 52 ++--
svx/source/svdraw/svdotextdecomposition.cxx |3 +
2 files changed, 53 insertions(+), 2 deletions(-)
New commits:
commit 8e7192c5e053684930e82a5c6bd53905ac2a
Author: matteocam
Date: Wed Jul 29 18:56:51 2015 +0200
Check GetNicChainingEvent before chaining in static mode
Change-Id: Ie3e4aeea896ae3269ee196d17d80505e2491eb71
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index b627b77..25feda4 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -1425,6 +1425,9 @@ void
SdrTextObj::impGetScrollTextTiming(drawinglayer::animation::AnimationEntryL
void SdrTextObj::impHandleChainingEventsDuringDecomposition(SdrOutliner
&rOutliner) const
{
+if (GetTextChain()->GetNilChainingEvent(this))
+return;
+
GetTextChain()->SetNilChainingEvent(this, true);
TextChainFlow aTxtChainFlow(const_cast(this));
commit 452ac5b3b37dc3c06ff0dbe958cc65417f2ed064
Author: matteocam
Date: Wed Jul 29 18:54:55 2015 +0200
Set link at calls of IsChainable. (not working)
Change-Id: Ia6b57c560f20abac8cac98c29880d7aa5b962d7c
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index ca28046..46b1bbc 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1984,12 +1984,60 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus*
pEditStatus )
}
}
+// XXX: Make it a method somewhere?
+SdrObject *ImpGetObjByName(SdrObjList *pObjList, OUString aObjName)
+{
+// scan the whole list
+size_t nObjCount = pObjList->GetObjCount();
+for (unsigned i = 0; i < nObjCount; i++) {
+SdrObject *pCurObj = pObjList->GetObj(i);
+
+if (pCurObj->GetName() == aObjName) {
+return pCurObj;
+}
+}
+// not found
+return NULL;
+}
+
+// XXX: Make it a (private) method of SdrTextObj
+void ImpUpdateChainLinks(SdrTextObj *pTextObj, OUString aNextLinkName)
+{
+// XXX: Current implementation constraints text boxes to be on the same
page
+
+// No next link
+if (aNextLinkName == "") {
+pTextObj->SetNextLinkInChain(NULL);
+return;
+}
+
+SdrPage *pPage = pTextObj->GetPage();
+assert(pPage);
+SdrTextObj *pNextTextObj = dynamic_cast< SdrTextObj * >
+(ImpGetObjByName(pPage, aNextLinkName));
+if (!pNextTextObj) {
+fprintf(stderr, "[CHAINING] Can't find object as next link.\n");
+return;
+}
+
+pTextObj->SetNextLinkInChain(pNextTextObj);
+}
+
bool SdrTextObj::IsChainable() const
{
// Read it as item
const SfxItemSet& rSet = GetObjectItemSet();
-OUString aNextName = static_cast(rSet.Get(SDRATTR_TEXT_CHAINNEXTNAME)).GetValue();
-return aNextName != ""; // XXX: Should we also check for
GetNilChainingEvent? (see old code below)
+OUString aNextLinkName = static_cast(rSet.Get(SDRATTR_TEXT_CHAINNEXTNAME)).GetValue();
+
+// Update links if any inconsistency is found
+bool bNextLinkUnsetYet = (aNextLinkName != "") && !mpNextInChain;
+bool bInconsistentNextLink = mpNextInChain && mpNextInChain->GetName() !=
aNextLinkName;
+// if the link is not set despite there should be one OR if it has changed
+if (bNextLinkUnsetYet || bInconsistentNextLink) {
+ImpUpdateChainLinks(const_cast(this), aNextLinkName);
+}
+
+return aNextLinkName != ""; // XXX: Should we also check for
GetNilChainingEvent? (see old code below)
/*
// Check that no overflow is going on
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-3' - 2 commits - loleaflet/Makefile
loleaflet/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7dc7dce1eab3f92c5bafbae3fad4c1659b1db938 Author: Mihai Varga Date: Wed Jul 29 19:18:25 2015 +0300 loleaflet: bump version after tarball diff --git a/loleaflet/Makefile b/loleaflet/Makefile index 29473e3..e0c07c7 100644 --- a/loleaflet/Makefile +++ b/loleaflet/Makefile @@ -1,6 +1,6 @@ # Version number of loleaflet, no need to be in sync with the loolwsd one -VERSION=1.1.16 +VERSION=1.1.17 # Version number of the bundled 'draw' thing DRAW_VERSION=0.2.4 commit 8970c229b15f6c69e9b1acd4e863e33b8e5b3332 Author: Mihai Varga Date: Wed Jul 29 19:17:19 2015 +0300 loleaflet: bump version for tarball diff --git a/loleaflet/Makefile b/loleaflet/Makefile index 2794cc0..29473e3 100644 --- a/loleaflet/Makefile +++ b/loleaflet/Makefile @@ -1,6 +1,6 @@ # Version number of loleaflet, no need to be in sync with the loolwsd one -VERSION=1.1.15 +VERSION=1.1.16 # Version number of the bundled 'draw' thing DRAW_VERSION=0.2.4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/cursor.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 79c9598d0a586f44757954556661ce6eda1f997e
Author: Miklos Vajna
Date: Wed Jul 29 18:09:32 2015 +0200
tdf#92982 vcl::Cursor: handle rendercontext
With this, vcl::Cursor does not paint on the vcl::Window directly, and
in case the output should be something other than pRenderContext, it
should be a one-liner change to do that.
Change-Id: I57833f6f8589286260d96f412f1fcc681e6c5c8c
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 0d893ca..2eaa551 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -44,8 +44,9 @@ struct ImplCursorData
static void ImplCursorInvert( ImplCursorData* pData )
{
vcl::Window* pWindow = pData->mpWindow;
-boolbMapMode = pWindow->IsMapModeEnabled();
-pWindow->EnableMapMode( false );
+vcl::RenderContext* pRenderContext = pWindow->GetOutDev();
+boolbMapMode = pRenderContext->IsMapModeEnabled();
+pRenderContext->EnableMapMode( false );
InvertFlags nInvertStyle;
if ( pData->mnStyle & CURSOR_SHADOW )
nInvertStyle = InvertFlags::N50;
@@ -107,12 +108,12 @@ static void ImplCursorInvert( ImplCursorData* pData )
if ( pData->mnOrientation )
aPoly.Rotate( pData->maPixRotOff, pData->mnOrientation );
-pWindow->Invert( aPoly, nInvertStyle );
+pRenderContext->Invert( aPoly, nInvertStyle );
}
}
else
-pWindow->Invert( aRect, nInvertStyle );
-pWindow->EnableMapMode( bMapMode );
+pRenderContext->Invert( aRect, nInvertStyle );
+pRenderContext->EnableMapMode( bMapMode );
}
void vcl::Cursor::ImplDraw()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - 124 commits - accessibility/source animations/source basctl/source basic/source bin/find-unused-defines.awk bin/find-unused-defi
Rebased ref, commits from common ancestor:
commit 0f482ad82b57fd881935e939cbe7b674aab710ff
Author: Pranav Kant
Date: Wed Jul 29 21:41:56 2015 +0530
lokdocview: Don't use extern variable: lokThreadPool
Change-Id: Ia208e3309bb64baf71ceb97cdf1b3b57b6120353
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index d13fb9b..47d75a3 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -49,6 +49,7 @@ struct _LOKDocViewPrivate
LibreOfficeKitDocument* m_pDocument;
TileBuffer m_aTileBuffer;
+GThreadPool* lokThreadPool;
gfloat m_fZoom;
glong m_nDocumentWidthTwips;
@@ -151,8 +152,6 @@ G_DEFINE_TYPE_WITH_CODE (LOKDocView, lok_doc_view,
GTK_TYPE_DRAWING_AREA,
#pragma GCC diagnostic pop
#endif
-GThreadPool* lokThreadPool;
-
/// Helper struct used to pass the data from soffice thread -> main thread.
struct CallbackData
{
@@ -307,7 +306,7 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent)
pLOEvent->m_nCharCode = nCharCode;
pLOEvent->m_nKeyCode = nKeyCode;
g_task_set_task_data(task, pLOEvent, g_free);
-g_thread_pool_push(lokThreadPool, g_object_ref(task), NULL);
+g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);
g_object_unref(task);
}
else
@@ -318,7 +317,7 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent)
pLOEvent->m_nCharCode = nCharCode;
pLOEvent->m_nKeyCode = nKeyCode;
g_task_set_task_data(task, pLOEvent, g_free);
-g_thread_pool_push(lokThreadPool, g_object_ref(task), NULL);
+g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);
g_object_unref(task);
}
@@ -486,7 +485,7 @@ setTilesInvalid (LOKDocView* pDocView, const GdkRectangle&
rRectangle)
for (int j = aStart.y; j < aEnd.y; j++)
{
GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
-priv->m_aTileBuffer.setInvalid(i, j, priv->m_fZoom, task);
+priv->m_aTileBuffer.setInvalid(i, j, priv->m_fZoom, task,
priv->lokThreadPool);
g_object_unref(task);
}
}
@@ -759,7 +758,7 @@ renderDocument(LOKDocView* pDocView, cairo_t* pCairo)
if (bPaint)
{
GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
-Tile& currentTile = priv->m_aTileBuffer.getTile(nRow, nColumn,
priv->m_fZoom, task);
+Tile& currentTile = priv->m_aTileBuffer.getTile(nRow, nColumn,
priv->m_fZoom, task, priv->lokThreadPool);
GdkPixbuf* pPixBuf = currentTile.getBuffer();
gdk_cairo_set_source_pixbuf (pCairo, pPixBuf,
twipToPixel(aTileRectangleTwips.x, priv->m_fZoom),
@@ -897,7 +896,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget,
GdkEventButton* pEvent)
pLOEvent->m_nSetGraphicSelectionY = pixelToTwip(pEvent->y,
priv->m_fZoom);
g_task_set_task_data(task, pLOEvent, g_free);
-g_thread_pool_push(lokThreadPool, g_object_ref(task), NULL);
+g_thread_pool_push(priv->lokThreadPool, g_object_ref(task),
NULL);
g_object_unref(task);
return FALSE;
@@ -916,7 +915,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget,
GdkEventButton* pEvent)
pLOEvent->m_nSetGraphicSelectionY = pixelToTwip(pEvent->y,
priv->m_fZoom);
g_task_set_task_data(task, pLOEvent, g_free);
-g_thread_pool_push(lokThreadPool, g_object_ref(task), NULL);
+g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);
g_object_unref(task);
return FALSE;
@@ -965,7 +964,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget,
GdkEventButton* pEvent)
pLOEvent->m_nSetGraphicSelectionY =
pixelToTwip(priv->m_aGraphicHandleRects[i].y +
priv->m_aGraphicHandleRects[i].height / 2, priv->m_fZoom);
g_task_set_task_data(task, pLOEvent, g_free);
-g_thread_pool_push(lokThreadPool, g_object_ref(task),
NULL);
+g_thread_pool_push(priv->lokThreadPool,
g_object_ref(task), NULL);
g_object_unref(task);
return FALSE;
@@ -993,7 +992,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget,
GdkEventButton* pEvent)
pLOEvent->m_nPostMouseEventCount = nCount;
g_task_set_task_data(task, pLOEvent, g_free);
-g_thread_pool_push(lokThreadPool, g_object_ref(task), NULL);
+g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);
g_object_unref(task);
break;
}
@@ -1011,7 +1010,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget,
GdkEventButton* pEvent)
pLOEvent->m_nPostMouseEventCount = nCount;
g_task_set_task_data(task, pLOEvent, g_free);
-g_thread_pool
[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-3' - 12 commits - loleaflet/build loleaflet/debug loleaflet/dist loleaflet/README loleaflet/src
loleaflet/README | 84 +
loleaflet/build/deps.js | 29 +-
loleaflet/debug/document/document_simple_example.html | 28 -
loleaflet/dist/leaflet.css|8
loleaflet/src/control/Control.Scroll.js | 93 ++
loleaflet/src/control/Scroll.js | 19 +
loleaflet/src/layer/tile/GridLayer.js | 50 ---
loleaflet/src/layer/tile/TileLayer.js | 254 --
loleaflet/src/map/Map.js | 23 -
loleaflet/src/map/handler/Map.Keyboard.js | 214 ++-
loleaflet/src/map/handler/Map.Mouse.js| 131 +
loleaflet/src/map/handler/Map.Scroll.js | 59
loleaflet/src/map/handler/Map.ScrollWheelZoom.js | 68
13 files changed, 582 insertions(+), 478 deletions(-)
New commits:
commit fd00c9b133fc709fb6bea739ac15a93bb2c81b4d
Author: Mihai Varga
Date: Wed Jul 29 19:08:59 2015 +0300
loleaflet: cherry-pick fix
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index dcaef5e..2c58f86 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -120,7 +120,6 @@ L.TileLayer = L.GridLayer.extend({
getEvents: function () {
var events = {
viewreset: this._viewReset,
- movestart: this._moveStart,
moveend: this._move
};
commit 71b015657626b9dc356ed2a528aa689336f806f4
Author: Mihai Varga
Date: Fri Jul 24 17:17:49 2015 +0300
loleaflet: keyboard navigation now also fires 'scrollby' event
Conflicts:
loleaflet/src/map/handler/Map.Keyboard.js
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js
b/loleaflet/src/map/handler/Map.Keyboard.js
index 084fc03..f1454b5 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -4,6 +4,8 @@
L.Map.mergeOptions({
keyboard: true,
+ keyboardPanOffset: 20,
+ keyboardZoomOffset: 1
});
L.Map.Keyboard = L.Handler.extend({
@@ -93,8 +95,19 @@ L.Map.Keyboard = L.Handler.extend({
46 : true // delete
},
+ navigationKeyCodes: {
+ left:[37],
+ right: [39],
+ down:[40],
+ up: [38],
+ zoomIn: [187, 107, 61, 171],
+ zoomOut: [189, 109, 173]
+ },
+
initialize: function (map) {
this._map = map;
+ this._setPanOffset(map.options.keyboardPanOffset);
+ this._setZoomOffset(map.options.keyboardZoomOffset);
},
addHooks: function () {
@@ -109,6 +122,38 @@ L.Map.Keyboard = L.Handler.extend({
this._map.on('keydown keyup keypress', this._onKeyDown, this);
},
+ _setPanOffset: function (pan) {
+ var keys = this._panKeys = {},
+ codes = this.navigationKeyCodes,
+ i, len;
+
+ for (i = 0, len = codes.left.length; i < len; i++) {
+ keys[codes.left[i]] = [-1 * pan, 0];
+ }
+ for (i = 0, len = codes.right.length; i < len; i++) {
+ keys[codes.right[i]] = [pan, 0];
+ }
+ for (i = 0, len = codes.down.length; i < len; i++) {
+ keys[codes.down[i]] = [0, pan];
+ }
+ for (i = 0, len = codes.up.length; i < len; i++) {
+ keys[codes.up[i]] = [0, -1 * pan];
+ }
+ },
+
+ _setZoomOffset: function (zoom) {
+ var keys = this._zoomKeys = {},
+ codes = this.navigationKeyCodes,
+ i, len;
+
+ for (i = 0, len = codes.zoomIn.length; i < len; i++) {
+ keys[codes.zoomIn[i]] = zoom;
+ }
+ for (i = 0, len = codes.zoomOut.length; i < len; i++) {
+ keys[codes.zoomOut[i]] = -zoom;
+ }
+ },
+
_onMouseDown: function () {
if (this._map._docLayer._permission === 'edit') {
return;
@@ -131,30 +176,41 @@ L.Map.Keyboard = L.Handler.extend({
return;
}
- if (docLayer._permission !== 'edit') {
- return;
- }
-
- var charCode = e.originalEvent.charCode;
- var keyCode = e.originalEvent.keyCode;
- if (e.type === 'keydown' && this.handleOnKeyDown[keyCode] &&
charCode === 0) {
- docLayer._postKeyboardEvent('input', charCode,
this._toUNOKeyCode(keyCode));
- }
- else if (e.type === 'keypress' &&
- (!t
[Libreoffice-commits] core.git: chart2/source chart2/uiconfig
chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 10
chart2/source/controller/sidebar/ChartSeriesPanel.hxx |3
chart2/uiconfig/ui/sidebarseries.ui | 408 --
3 files changed, 290 insertions(+), 131 deletions(-)
New commits:
commit 2d4223e32628d12b9b256b532819e6cced79178e
Author: Katarina Behrens
Date: Tue Jul 28 17:34:20 2015 +0200
Some (mostly HIG) tweaks to chart data series panel
Additional tweak: use 'Data series %1' as frame label, substitute
%1 by real series name
Change-Id: Id5bee4c2e52ccd98fa40649ec539b3efdee55962
Reviewed-on: https://gerrit.libreoffice.org/17387
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 644766d..85336ff 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -302,9 +302,11 @@ ChartSeriesPanel::ChartSeriesPanel(
get(mpRBPrimaryAxis, "radiobutton_primary_axis");
get(mpRBSecondaryAxis, "radiobutton_secondary_axis");
+get(mpBoxLabelPlacement, "datalabel_box");
get(mpLBLabelPlacement, "comboboxtext_label");
get(mpFTSeriesName, "label_series_name");
+get(mpFTSeriesTemplate, "label_series_tmpl");
Initialize();
}
@@ -330,9 +332,11 @@ void ChartSeriesPanel::dispose()
mpRBPrimaryAxis.clear();
mpRBSecondaryAxis.clear();
+mpBoxLabelPlacement.clear();
mpLBLabelPlacement.clear();
mpFTSeriesName.clear();
+mpFTSeriesTemplate.clear();
PanelLayout::dispose();
}
@@ -374,10 +378,12 @@ void ChartSeriesPanel::updateData()
mpRBPrimaryAxis->Check(bPrimaryAxis);
mpRBSecondaryAxis->Check(!bPrimaryAxis);
-mpLBLabelPlacement->Enable(bLabelVisible);
+mpBoxLabelPlacement->Enable(bLabelVisible);
mpLBLabelPlacement->SelectEntryPos(getDataLabelPlacement(mxModel, aCID));
-mpFTSeriesName->SetText(getSeriesLabel(mxModel, aCID));
+OUString aFrameLabel = mpFTSeriesTemplate->GetText();
+aFrameLabel = aFrameLabel.replaceFirst("%1", getSeriesLabel(mxModel,
aCID));
+mpFTSeriesName->SetText(aFrameLabel);
}
VclPtr ChartSeriesPanel::Create (
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
index 156bbc7..d125c2f 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include "ChartSidebarModifyListener.hxx"
#include "ChartSidebarSelectionListener.hxx"
@@ -91,9 +92,11 @@ private:
VclPtr mpRBPrimaryAxis;
VclPtr mpRBSecondaryAxis;
+VclPtr mpBoxLabelPlacement;
VclPtr mpLBLabelPlacement;
VclPtr mpFTSeriesName;
+VclPtr mpFTSeriesTemplate;
css::uno::Reference mxFrame;
diff --git a/chart2/uiconfig/ui/sidebarseries.ui
b/chart2/uiconfig/ui/sidebarseries.ui
index 88180b5..bdaca87 100644
--- a/chart2/uiconfig/ui/sidebarseries.ui
+++ b/chart2/uiconfig/ui/sidebarseries.ui
@@ -5,147 +5,297 @@
True
False
+6
-
+
True
False
+vertical
+6
-
-True
-False
-label
-
-
-0
-0
-
-
-
-
-Show data
label
-True
-True
-False
-0
-True
-
-
-0
-1
-
-
-
-
-Trendline
-True
-True
-False
-0
-True
-
-
-0
-2
-
-
-
-
-True
-False
-Axis:
-
-
-0
-3
-
-
-
-
-Primary Y-Axis
-True
-True
-False
-0
-True
-True
-
-
-1
-3
-
-
-
-
-Secondary
Y-Axis
-True
-True
-False
-0
-0.4900953674316
-True
-True
-radiobutton_primary_axis
-
-
-1
-4
-
-
-
-
-Y Error Bars
-True
-True
-False
-0
-True
-
-
-0
-5
-
-
-
-
-X Error Bars
-True
-True
-False
-0
-True
-
-
-1
-5
-
+
[Libreoffice-commits] core.git: chart2/source chart2/uiconfig
chart2/source/controller/sidebar/ChartElementsPanel.cxx |7
chart2/source/controller/sidebar/ChartElementsPanel.hxx |2
chart2/uiconfig/ui/sidebarelements.ui | 743 +---
3 files changed, 455 insertions(+), 297 deletions(-)
New commits:
commit 93d301a287141013c28556570d67ffc9d3286b2a
Author: Katarina Behrens
Date: Tue Jul 28 16:19:59 2015 +0200
Some (mostly HIG) tweaks to chart elements panel
As I wanted to represent subsections as frames (it looks kinda
better with bold labels), I tried to emulate grid behaviour by
putting widgets into 2 size groups
Other tweaks include disabling legend position listbox when legend
is not to be shown and missing clear() of that listbox
Change-Id: I0b635fe5aba1580542cf982e2e6be02eb0056352
Reviewed-on: https://gerrit.libreoffice.org/17386
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index fd498ff..08d1fea 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -310,6 +310,7 @@ ChartElementsPanel::ChartElementsPanel(
get(mpCBGridHorizontalMinor, "checkbutton_gridline_horizontal_minor");
get(mpLBLegendPosition, "comboboxtext_legend");
+get(mpBoxLegend, "box_legend");
Initialize();
}
@@ -342,6 +343,9 @@ void ChartElementsPanel::dispose()
mpCBGridVerticalMinor.clear();
mpCBGridHorizontalMinor.clear();
+mpLBLegendPosition.clear();
+mpBoxLegend.clear();
+
PanelLayout::dispose();
}
@@ -491,7 +495,10 @@ IMPL_LINK(ChartElementsPanel, CheckBoxHdl, CheckBox*,
pCheckBox)
else if (pCheckBox == mpCB2ndYAxisTitle.get())
setTitleVisible(mxModel, TitleHelper::SECONDARY_Y_AXIS_TITLE,
bChecked);
else if (pCheckBox == mpCBLegend.get())
+{
+mpBoxLegend->Enable( bChecked );
setLegendVisible(mxModel, bChecked);
+}
else if (pCheckBox == mpCBGridVerticalMajor.get())
setGridVisible(mxModel, GridType::VERT_MAJOR, bChecked);
else if (pCheckBox == mpCBGridHorizontalMajor.get())
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx
b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
index 766915c..47265fb 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include "ChartSidebarModifyListener.hxx"
#include
@@ -95,6 +96,7 @@ private:
VclPtr mpCBGridHorizontalMinor;
VclPtr mpLBLegendPosition;
+VclPtr mpBoxLegend;
css::uno::Reference mxFrame;
::sfx2::sidebar::EnumContextmaContext;
diff --git a/chart2/uiconfig/ui/sidebarelements.ui
b/chart2/uiconfig/ui/sidebarelements.ui
index 94d1ff0..8250d6e 100644
--- a/chart2/uiconfig/ui/sidebarelements.ui
+++ b/chart2/uiconfig/ui/sidebarelements.ui
@@ -5,338 +5,487 @@
True
False
+6
-
+
True
False
-immediate
-True
-True
+vertical
+6
-
-Subtitle
-True
-True
-False
-0
-True
-
-
-1
-1
-
-
-
-
-X-Axis
-True
-True
-False
-0
-True
-
-
-0
-3
-
-
-
-
+
True
False
-0
-Axes
+0
+none
+
+
+True
+False
+6
+12
+
+
+True
+False
+6
+6
+
+
+Subtitle
+True
+True
+False
+0
+True
+
+
+1
+0
+
+
+
+
+Title
+True
+True
+False
+0
+True
+
+
+0
+0
+
+
+
+
+
+
+
+
+True
+False
+Title
+
+
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source
svx/source/svdraw/svdotext.cxx | 28 +++-
1 file changed, 3 insertions(+), 25 deletions(-)
New commits:
commit c835e327d9941cf65d82fbdf66c368a4e66016b4
Author: matteocam
Date: Wed Jul 29 17:38:09 2015 +0200
Remove old code
Change-Id: Ie226e450d3013c92e9a0236a1c3cfd214b6edab5
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 66b8a7a..ca28046 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1989,35 +1989,13 @@ bool SdrTextObj::IsChainable() const
// Read it as item
const SfxItemSet& rSet = GetObjectItemSet();
OUString aNextName = static_cast(rSet.Get(SDRATTR_TEXT_CHAINNEXTNAME)).GetValue();
-return aNextName != "";
-
-// XXX
-if (!GetName().startsWith("Chainable")) {
-//fprintf(stderr, "[CHAINABLE?] %p is _not_ chainable\n", this);
-return false;
-}
+return aNextName != ""; // XXX: Should we also check for
GetNilChainingEvent? (see old code below)
+/*
// Check that no overflow is going on
if (!GetTextChain() || GetTextChain()->GetNilChainingEvent(this))
return false;
-
- // XXX: Hack to have links together
-static bool bHasDoneTheLinking = false;
-
-SdrTextObj *pTxtObj0 = dynamic_cast< SdrTextObj * >( pPage->GetObj( 0 ) );
-
-if (!bHasDoneTheLinking && pPage && pPage->GetObjCount() > 1 && this ==
pTxtObj0)
-{
-SdrTextObj *pTxtObj1 = dynamic_cast< SdrTextObj * >( pPage->GetObj( 1
) );
-const_cast(this)->SetNextLinkInChain(pTxtObj1);
-
-bHasDoneTheLinking = true;
-}
-// end hack
-
-
-return true;
-
+*/
}
void SdrTextObj::onChainingEvent()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/leaflet.css |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9339004176ba6adf06725cec008cd82042632ba3
Author: Mihai Varga
Date: Wed Jul 29 18:07:50 2015 +0300
loleaflet: no rectangle around toolbar buttons
diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index dc6ae45..da34f0c 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -309,6 +309,7 @@
/* Toolbar buttons control */
.leaflet-control-buttons-container {
+ box-shadow: 0 0 0;
}
.leaflet-control-buttons,
@@ -553,6 +554,7 @@ a.leaflet-control-buttons:hover:first-child {
}
#document-container {
+ border-top: 2px solid #B6B6B6;
background: #DFDFDF;
position: absolute;
top: 65px;
@@ -727,7 +729,6 @@ a.leaflet-control-buttons:hover:first-child {
}
#toolbar {
- border-bottom: 2px solid #B6B6B6;
position: fixed;
top: 0;
left: 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - xmloff/source
xmloff/source/draw/ximpshap.cxx | 26 +-
xmloff/source/draw/ximpshap.hxx |1 +
2 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 6338b3465f993231dcf7a6a769e3f6b5d8d729e0
Author: matteocam
Date: Wed Jul 29 17:06:22 2015 +0200
Set Uno property for chain-next-name from SdXMLTextBoxShapeContext
Change-Id: Ie9dab5768ff555ab2b4c90fffb0311865154f29c
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index c9ad9f5..6ca2075 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1600,7 +1600,8 @@ SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext(
uno::Reference< drawing::XShapes >& rShapes,
bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes,
bTemporaryShape ),
-mnRadius(0)
+mnRadius(0),
+maChainNextName("")
{
}
@@ -1619,6 +1620,12 @@ void SdXMLTextBoxShapeContext::processAttribute(
sal_uInt16 nPrefix, const OUStr
mnRadius, rValue);
return;
}
+
+if( IsXMLToken( rLocalName, XML_CHAIN_NEXT_NAME ) )
+{
+maChainNextName = rValue;
+return;
+}
}
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
@@ -1752,6 +1759,23 @@ void SdXMLTextBoxShapeContext::StartElement(const
uno::Reference< xml::sax::XAtt
}
}
+if(maChainNextName != "")
+{
+uno::Reference< beans::XPropertySet > xPropSet(mxShape,
uno::UNO_QUERY);
+if(xPropSet.is())
+{
+try
+{
+xPropSet->setPropertyValue("TextChainNextName",
+ uno::makeAny( maChainNextName )
);
+}
+catch(const uno::Exception&)
+{
+OSL_FAIL( "exception during setting of name of next chain
link!");
+}
+}
+}
+
SdXMLShapeContext::StartElement(mxAttrList);
}
}
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index ac95e7d..50ddb25 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -245,6 +245,7 @@ public:
class SdXMLTextBoxShapeContext : public SdXMLShapeContext
{
sal_Int32 mnRadius;
+OUStringmaChainNextName;
public:
TYPEINFO_OVERRIDE();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - loleaflet/debug loleaflet/dist loleaflet/src loolwsd/LOOLSession.cpp
loleaflet/debug/document/document_simple_example.html |9 --
loleaflet/dist/leaflet.css| 77 +-
loleaflet/src/control/Control.Buttons.js |4
loolwsd/LOOLSession.cpp |3
4 files changed, 83 insertions(+), 10 deletions(-)
New commits:
commit f3d5b7c09c6e2e2d755dbbca2e684e8710212ee1
Author: Mihai Varga
Date: Wed Jul 29 17:02:32 2015 +0300
loleaflet: UI tweaks
diff --git a/loleaflet/debug/document/document_simple_example.html
b/loleaflet/debug/document/document_simple_example.html
index 90bfdf1..ec279af 100644
--- a/loleaflet/debug/document/document_simple_example.html
+++ b/loleaflet/debug/document/document_simple_example.html
@@ -31,10 +31,9 @@
The "map" div is the actual document and it has the document's size
and width, this being inside the smaller "document-container" will
cause the content to overflow, creating scrollbars -->
-
-This space is a placeholder for the future
toolbar
+
-
+
@@ -68,11 +67,11 @@
// Controls /
map.addControl(L.control.buttons());
+map.addControl(L.control.zoom());
+map.addControl(L.control.parts());
map.addControl(L.control.search());
map.addControl(L.control.permissionSwitch());
map.addControl(L.control.selection());
-map.addControl(L.control.zoom());
-map.addControl(L.control.parts());
map.addControl(L.control.statusIndicator());
map.addControl(L.control.scroll());
diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index ca38896..dc6ae45 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -233,6 +233,7 @@
border-radius: 4px;
display: inline-block;
margin: 3px;
+ vertical-align: middle;
}
.leaflet-bar a,
.leaflet-bar a:hover {
@@ -308,7 +309,6 @@
/* Toolbar buttons control */
.leaflet-control-buttons-container {
- float: left;
}
.leaflet-control-buttons,
@@ -327,11 +327,20 @@ a.leaflet-control-buttons:hover {
margin-left: 3px;
}
+a.leaflet-control-buttons:first-child,
+a.leaflet-control-buttons:hover:first-child {
+ margin-left: 0px;
+ }
.leaflet-control-buttons-active {
border: thin solid;
}
-
+.leaflet-control-button-separator {
+ width: 14px;
+ height: 1px;
+ float: left;
+ visibility: hidden;
+ }
/* layers control */
@@ -546,7 +555,7 @@ a.leaflet-control-buttons:hover {
#document-container {
background: #DFDFDF;
position: absolute;
- top: 100px;
+ top: 65px;
bottom: 0px;
right: 0px;
left: 0px;
@@ -716,3 +725,65 @@ a.leaflet-control-buttons:hover {
color: #7E7E7E;
border-top: #FFF 1px solid;
}
+
+#toolbar {
+ border-bottom: 2px solid #B6B6B6;
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ padding-bottom: 15px;
+ padding-top: 15px;
+ text-align: center;
+}
+
+.leaflet-bar a {
+float: left;
+}
+
+div .leaflet-bar a:last-child {
+border-bottom: 1px solid #ccc;
+}
+
+.leaflet-control-editviewswitch.leaflet-bar
+, leaflet-control-search.leaflet-bar {
+
+}
+
+label.leaflet-control-editviewswitch {
+padding: 0.2em 0.4em 0.2em 0em;
+}
+
+input.leaflet-control-search-bar {
+padding: 0.3em;
+}
+
+.leaflet-control-zoom.leaflet-bar {
+margin-left: 0.5em;
+}
+
+div.leaflet-control-zoom leaflet-bar {
+width: 53px;
+}
+
+button.leaflet-control-search-prev {
+margin-left: 0.2em;
+}
+
+button.leaflet-control-search-next
+, leaflet-control-search-cancel {
+margin-right: 0.2em;
+}
+
+#toolbar label
+, .leaflet-control-search {
+background-color: #fff;
+}
+
+div .leaflet-bar a:first-child {
+border-radius: 4px 0 0 4px;
+}
+
+div .leaflet-bar a:last-child {
+border-radius: 0 4px 4px 0;
+}
diff --git a/loleaflet/src/control/Control.Buttons.js
b/loleaflet/src/control/Control.Buttons.js
index d544ae9..076c642 100644
--- a/loleaflet/src/control/Control.Buttons.js
+++ b/loleaflet/src/control/Control.Buttons.js
@@ -25,6 +25,10 @@ L.Control.Buttons = L.Control.extend({
};
for (var key in this._buttons) {
var button = this._buttons[key];
+ if (key === 'alignleft' || key === 'save') {
+ // add a separator
+ L.DomUtil.create('span',
'leaflet-control-button-separator', container);
+ }
button.el = this._createButton(key, button.title,
button.iconName,
buttonsName, container, this._onButtonClick);
}
commit 4ae546d7bd80076adfecf9012d8a31d53629f57b
Author: Mihai Varga
Date: Wed Jul 29 16:58:43 2015 +0300
loolwsd: don't move editing tiles to persistent on saveAs
diff
Re: Patch: Fix bug 90222 - Replace ScaList with std container
Hi Ryan,
Thanks for your patch!
On Wednesday, 2015-07-29 22:45:18 +1200, Ryan McCoskrie wrote:
> (I'm having trouble with logerrit)
That is why? We much prefer patches on gerrit, it eases review and
handling a lot. Using git review might also be an option for you. If for
some reason you *have* to use mail attachments, please use git
format-patch to generate the patch to be attached, which preserves
author and date and commit message, or even use the git send-email
command.
That being said ...
> diff --git a/scaddins/source/datefunc/datefunc.cxx
> b/scaddins/source/datefunc/datefunc.cxx
> ScaFuncDataList::ScaFuncDataList( ResMgr& rResMgr ) :
> -nLast( 0x )
> +nLast( contents.begin() )
This looks odd. I think it should be contents.end() instead. But why
change it to iterator anyway? When using a vector, the last accessed
name could still be remembered as offset into the vector.
> ScaFuncDataList::~ScaFuncDataList()
> {
> -for( ScaFuncData* pFData = First(); pFData; pFData = Next() )
> -delete pFData;
> +for( std::vector::iterator it = contents.begin(); it !=
> contents.end(); ++it )
> +delete *nLast;
This does not work.. it deletes *nLast multiple times. It should be *it
instead.
> -const ScaFuncData* ScaFuncDataList::Get( const OUString& rProgrammaticName )
> const
> +const ScaFuncData* ScaFuncDataList::Get( const OUString& rProgrammaticName )
> {
> if( aLastName == rProgrammaticName )
> -return Get( nLast );
> +return *nLast;
So this could be return contents[nLast]; if nLast was still the offset
intead of an iterator.
> diff --git a/scaddins/source/datefunc/datefunc.hxx
> b/scaddins/source/datefunc/datefunc.hxx
> -class ScaFuncDataList : private ScaList
> +class ScaFuncDataList
> {
> -OUString aLastName;
> -sal_uInt32 nLast;
> +OUStringaLastName;
> +std::vector::iterator nLast;
Please adapt the variable name when changing the type, we use the 'n'
prefix for numeric variables, it then should be itLast or some such.
However, as said, size_t nLast would still be fine.
> +std::vector contents;
Maybe naming it vContents would be better.
> -inline const ScaFuncData* Get( sal_uInt32 nIndex ) const;
> -const ScaFuncData* Get( const OUString& rProgrammaticName )
> const;
> +const ScaFuncData* Get( const OUString& rProgrammaticName );
Instead of making the function non-const you could also make nLast and
aLastName mutable member variables.
All above the same for the pricing Add-In.
> diff --git a/scaddins/source/pricing/pricing.cxx
> b/scaddins/source/pricing/pricing.cxx
> ScaFuncDataList::~ScaFuncDataList()
> {
> -for( ScaFuncData* pFData = First(); pFData; pFData = Next() )
> -delete pFData;
> +for( std::vector::iterator it = contents.begin(); it !=
> contents.end(); ++it )
> +delete *it;
This one correctly deletes *it.
Last but not least:
Apparently we don't have your license statement on file, could you
please send us a blanket statement that you contribute all your past and
future patches under the MPLv2 and LGPLv3+ licenses? Best on the dev
mailing list libreoffice@lists.freedesktop.org so we can link to it from
https://wiki.documentfoundation.org/Development/Developers
Something like this does nicely:
All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.
Best use Subject: license statement
Sorry for the inconvenience and thank you for cooperating :-)
Eike
--
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack
pgpDCq6Cj35p1.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Docker container for building LibreOffice
On Mon, Jul 27, 2015 at 3:22 PM, Dashamir Hoxha wrote: > Thanks Eike, your explanation makes sense. > > On Mon, Jul 27, 2015 at 2:55 PM, Eike Rathke wrote: >> >> >> Building LibreOffice needs more RAM. At least 4GB, when building with > > debug or dbgutil even more. Using swap instead of real RAM is an option, >> but it will result in much increased compile times. The cc1plus abort >> you experienced is quite likely related to memory being exhausted. > > > I will try to confirm this by running the compilation in a machine with > 4GB RAM. > I can confirm that the compilation works well on a machine with 4GB RAM: - https://drive.google.com/open?id=0B7H_DCc2DjNGdFR6S2dQWXpyUGs So, it was just a problem with lack of resources, no problems with docker etc. I can set the Albanian language, but there is no localization for Albanian. However this is a different issue and probably I should ask on the l10n list. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/window/salmenu.cxx | 19 +-- 1 file changed, 1 insertion(+), 18 deletions(-) New commits: commit 09aa0d142e9573fac898ea270d659e3ed7ef019c Author: Tor Lillqvist Date: Wed Jul 29 15:16:55 2015 +0300 This OWNERDRAW thing has been commented-out since 2003 Change-Id: I3170dec0578e0e54a2edb85e0a3a8fcd796b94ae diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index 422701a..0b623e2 100644 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -31,11 +31,6 @@ #include #include -// uncomment the following line to have ownerdrawn menus, ie, with bitmaps -// however, this is incompatible with OLE inplace editing -// so it is not activated by default -//#define OWNERDRAW - static DWORD myerr=0; bool SalData::IsKnownMenuHandle( HMENU hMenu ) @@ -98,11 +93,6 @@ SalMenuItem* WinSalInstance::CreateMenuItem( const SalItemParams* pItemData ) pSalMenuItem->mInfo.fMask = MIIM_TYPE | MIIM_STATE | MIIM_ID | MIIM_DATA; pSalMenuItem->mInfo.fType = MFT_STRING; -#ifdef OWNERDRAW -if( pItemData->pMenu && !pItemData->pMenu->IsMenuBar() ) -pSalMenuItem->mInfo.fType |= MFT_OWNERDRAW; -pSalMenuItem->mInfo.fState = MFS_ENABLED; -#endif pSalMenuItem->mInfo.dwTypeData = (LPWSTR) pSalMenuItem->mText.getStr(); pSalMenuItem->mInfo.cch = pSalMenuItem->mText.getLength(); @@ -310,10 +300,6 @@ void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OU pWItem->mText = pWItem->mText.replaceAll( "~", "&" ); pWItem->mInfo.fMask = MIIM_TYPE | MIIM_DATA; pWItem->mInfo.fType = MFT_STRING; -#ifdef OWNERDRAW -if( pWItem->mpMenu && !((Menu*) pWItem->mpMenu)->IsMenuBar() ) -pWItem->mInfo.fType |= MFT_OWNERDRAW; -#endif // combine text and accelerator text OUString aStr( pWItem->mText ); @@ -339,10 +325,7 @@ void WinSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const pWItem->mAccelText = rKeyName; pWItem->mInfo.fMask = MIIM_TYPE | MIIM_DATA; pWItem->mInfo.fType = MFT_STRING; -#ifdef OWNERDRAW -if( pWItem->mpMenu && !((Menu*)pWItem->mpMenu)->IsMenuBar() ) -pWItem->mInfo.fType |= MFT_OWNERDRAW; -#endif + // combine text and accelerator text OUString aStr( pWItem->mText ); if( pWItem->mAccelText.getLength() ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - 2 commits - fpicker/source
fpicker/source/office/RemoteFilesDialog.cxx | 35
1 file changed, 15 insertions(+), 20 deletions(-)
New commits:
commit c042209709c592f6ac121a57bba9d9893c56fa97
Author: Szymon KÅos
Date: Wed Jul 29 14:13:58 2015 +0200
save mode improvements
Change-Id: I14953eafb3fbd840df5f9c890b55855e14a1fd9a
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index 4544cf8..969e8f3 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -761,8 +761,11 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, SelectHdl )
}
else
{
-m_sPath.clear();
-m_pName_ed->SetText( "" );
+if( m_eMode == REMOTEDLG_MODE_OPEN )
+{
+m_sPath.clear();
+m_pName_ed->SetText( "" );
+}
}
EnableControls();
@@ -887,24 +890,10 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl )
bool bExists = false;
-Reference< XComponentContext > xContext =
::comphelper::getProcessComponentContext();
-Reference< XInteractionHandler > xInteractionHandler(
-InteractionHandler::createWithParent( xContext, 0 ),
UNO_QUERY_THROW );
-Reference< XCommandEnvironment > xEnv = new
::ucbhelper::CommandEnvironment(
-xInteractionHandler, Reference< XProgressHandler >() );
-::ucbhelper::Content m_aContent( m_sPath, xEnv, xContext );
-
-try
-{
-if( bFileDlg )
-bExists = m_aContent.isDocument();
-else
-bExists = m_aContent.isFolder();
-}
-catch( const Exception& )
-{
-bExists = false;
-}
+if( bFileDlg )
+bExists = ContentIsDocument(m_sPath);
+else
+bExists = ContentIsFolder(m_sPath);
if ( bExists )
{
@@ -921,6 +910,8 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl )
{
if( m_eMode == REMOTEDLG_MODE_OPEN )
return 0;
+if( m_eMode == REMOTEDLG_MODE_SAVE && ContentIsFolder(m_sPath) )
+return 0;
}
EndDialog( RET_OK );
commit 6d5ad561e65848ad87bab4d0fb1d4a7efdf4644d
Author: Szymon KÅos
Date: Wed Jul 29 12:42:12 2015 +0200
set no selection when user aborted auth
Change-Id: I15c865306948d4fe321b188324ad298fee322a6a
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index cf70a36..4544cf8 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -336,6 +336,10 @@ short RemoteFilesDialog::Execute()
Show();
SelectServiceHdl( NULL );
}
+if( !m_bIsConnected )
+{
+m_pServices_lb->SetNoSelection();
+}
short nRet = SvtFileDialog_Base::Execute();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source
include/vcl/window.hxx |5 -
vcl/inc/window.h|1
vcl/source/window/paint.cxx | 117 ++--
3 files changed, 62 insertions(+), 61 deletions(-)
New commits:
commit a33e0379bbe2c7651315f5cdc5925adab33b573b
Author: Miklos Vajna
Date: Wed Jul 29 12:40:49 2015 +0200
tdf#92982 vcl rendercontext: move buffer from PaintHelper to ImplFrameData
With this, code that wants to take a persistent render context (e.g.
vcl::Cursor) will be able to do so. This commit just moves the buffer,
though: it's still created / deleted by PaintHelper.
Having it in ImplFrameData means that we'll have one buffer / one
system window: i.e. toplevel window and its sub-widgets share a buffer.
Change-Id: Ic37220a2a483a7389aa04cd4313b6fc61a5408bf
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index f700794..d67b898 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -729,11 +729,8 @@ private:
This function is kind of recursive - it may be called from the
PaintHelper destructor; and on the other hand it creates PaintHelper
that (when destructed) calls other ImplCallPaint()'s.
-
-@param rBuffer VirtualDevice for double-buffering. It is only passed
-here, the actual handling happens in the PaintHelper.
*/
-SAL_DLLPRIVATE void ImplCallPaint(const
VclPtr& rBuffer, const vcl::Region* pRegion, sal_uInt16
nPaintFlags);
+SAL_DLLPRIVATE void ImplCallPaint(const vcl::Region*
pRegion, sal_uInt16 nPaintFlags);
SAL_DLLPRIVATE void ImplCallOverlapPaint();
SAL_DLLPRIVATE void ImplPostPaint();
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 0748760..39b94c0 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -179,6 +179,7 @@ struct ImplFrameData
::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::clipboard::XClipboard > mxSelection;
boolmbInternalDragGestureRecognizer;
+VclPtr mpBuffer; ///< Buffer for the double-buffering
};
struct ImplAccessibleInfos
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index a47c042..a94e3d0 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -44,7 +44,6 @@ class PaintHelper
{
private:
VclPtr m_pWindow;
-VclPtr m_pBuffer; ///< Buffer for the double-buffering
vcl::Region* m_pChildRegion;
Rectangle m_aSelectionRect;
Rectangle m_aPaintRect;
@@ -55,7 +54,7 @@ private:
bool m_bRestoreCursor : 1;
bool m_bCreatedBuffer : 1; ///< This PaintHelper created the buffer for
the double-buffering, and should dispose it when being destructed (if it is
still alive by then).
public:
-PaintHelper(vcl::Window* pWindow, const VclPtr& rBuffer,
sal_uInt16 nPaintFlags);
+PaintHelper(vcl::Window* pWindow, sal_uInt16 nPaintFlags);
void SetPop()
{
m_bPop = true;
@@ -86,10 +85,10 @@ public:
}
void DoPaint(const vcl::Region* pRegion);
-/// Create m_pBuffer, and set it up to have the same settings as m_pWindow.
+/// Create the buffer, and set it up to have the same settings as
m_pWindow.
void CreateBuffer();
-/// Setup m_pBuffer according to the settings of the current m_pWindow.
+/// Setup the buffer according to the settings of the current m_pWindow.
void SetupBuffer();
/// Paint the content of the buffer to the current m_pWindow.
@@ -98,9 +97,8 @@ public:
~PaintHelper();
};
-PaintHelper::PaintHelper(vcl::Window *pWindow, const VclPtr&
rBuffer, sal_uInt16 nPaintFlags)
+PaintHelper::PaintHelper(vcl::Window *pWindow, sal_uInt16 nPaintFlags)
: m_pWindow(pWindow)
-, m_pBuffer(rBuffer)
, m_pChildRegion(NULL)
, m_nPaintFlags(nPaintFlags)
, m_bPop(false)
@@ -111,9 +109,10 @@ PaintHelper::PaintHelper(vcl::Window *pWindow, const
VclPtr& rBuf
void PaintHelper::CreateBuffer()
{
-assert(!m_pBuffer);
+ImplFrameData* pFrameData = m_pWindow->mpWindowImpl->mpFrameData;
+assert(!pFrameData->mpBuffer);
-m_pBuffer = VclPtrInstance();
+pFrameData->mpBuffer = VclPtrInstance();
m_bCreatedBuffer = true;
SetupBuffer();
@@ -122,52 +121,54 @@ void PaintHelper::CreateBuffer()
m_aPaintRectMapMode = m_pWindow->GetMapMode();
// update the output size now, after all the settings were copied
-m_pBuffer->SetOutputSize(m_pWindow->GetOutputSize());
+pFrameData->mpBuffer->SetOutputSize(m_pWindow->GetOutputSize());
// we need to remember the mnOutOffX / mnOutOffY, but actually really
// set it just temporarily for the subwidgets - so we are setting it here
// only to remember the value & to be able to pass it to the descendants
// FIXME: once everything's double-buffered, this is (hopefully) not
-// necessary as the m_pBuffer is always created for the main window.
-m_pBuffer-
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdtrans.hxx |6 --
svx/source/svdraw/svddrgmt.cxx |2 +-
svx/source/svdraw/svdoole2.cxx |4 ++--
svx/source/svdraw/svdtrans.cxx | 33 -
4 files changed, 3 insertions(+), 42 deletions(-)
New commits:
commit 00269d39f655bb0ecb38c043a9516b4faefe6708
Author: Michael Stahl
Date: Wed Jul 29 13:51:49 2015 +0200
svx: remove duplicate "Kuerzen" function
Change-Id: I319ba12684398bcdfcd8d8ede1648e1d213e75a7
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index f70bfed..e54c745 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -249,12 +249,6 @@ SVX_DLLPUBLIC void OrthoDistance4(const Point& rPt0,
Point& rPt, bool bBigOrtho)
// Calculation and intermediate values are in BigInt
SVX_DLLPUBLIC long BigMulDiv(long nVal, long nMul, long nDiv);
-// Lossy cancellation of a fraction
-// nDigits specifies, how many significant digits the numerator
-// and denominator should at least be retained
-void Kuerzen(Fraction& rF, unsigned nDigits);
-
-
class FrPair {
Fraction aX;
Fraction aY;
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 52cce9c..aa445de 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -2422,7 +2422,7 @@ void SdrDragShear::MoveSdrDrag(const Point& rPnt)
bResize=true;
double nCos=cos(nTmpAngle*nPi180);
aNeuFact=nCos;
-Kuerzen(aFact,10); // three decimals should be enough
+aFact.ReduceInaccurate(10); // three decimals should be enough
}
if (nNewAngle>8900)
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 3dff9dd..b0988d8 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -2225,8 +2225,8 @@ bool SdrOle2Obj::CalculateNewScaling( Fraction&
aScaleWidth, Fraction& aScaleHei
aScaleHeight = Fraction(aSize.Height(), aObjAreaSize.Height() );
// reduce to 10 binary digits
-Kuerzen(aScaleHeight, 10);
-Kuerzen(aScaleWidth, 10);
+aScaleHeight.ReduceInaccurate(10);
+aScaleWidth.ReduceInaccurate(10);
return true;
}
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 476b4be..424cb91 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -584,39 +584,6 @@ long BigMulDiv(long nVal, long nMul, long nDiv)
return 0x7fff;
}
-void Kuerzen(Fraction& rF, unsigned nDigits)
-{
-sal_Int32 nMul=rF.GetNumerator();
-sal_Int32 nDiv=rF.GetDenominator();
-bool bNeg = false;
-if (nMul<0) { nMul=-nMul; bNeg=!bNeg; }
-if (nDiv<0) { nDiv=-nDiv; bNeg=!bNeg; }
-if (nMul==0 || nDiv==0) return;
-sal_uInt32 a;
-a=sal_uInt32(nMul); unsigned nMulZ=0; // count leading zeros
-while (a<0x0080) { nMulZ+=8; a<<=8; }
-while (a<0x8000) { nMulZ++; a<<=1; }
-a=sal_uInt32(nDiv); unsigned nDivZ=0; // count leading zeros
-while (a<0x0080) { nDivZ+=8; a<<=8; }
-while (a<0x8000) { nDivZ++; a<<=1; }
-// count the number of digits
-int nMulDigits=32-nMulZ;
-int nDivDigits=32-nDivZ;
-// count how many decimal places can be removed
-int nMulWeg=nMulDigits-nDigits; if (nMulWeg<0) nMulWeg=0;
-int nDivWeg=nDivDigits-nDigits; if (nDivWeg<0) nDivWeg=0;
-int nWeg=std::min(nMulWeg,nDivWeg);
-nMul>>=nWeg;
-nDiv>>=nWeg;
-if (nMul==0 || nDiv==0) {
-DBG_WARNING("Math error after canceling decimal places.");
-return;
-}
-if (bNeg) nMul=-nMul;
-rF=Fraction(nMul,nDiv);
-}
-
-
// How many eU units fit into a mm, respectively an inch?
// Or: How many mm, respectively inches, are there in an eU (and then give me
the inverse)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/dbdata.cxx | 24
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit f08ffc15e21ec60e587825de2450b4d31e88871a
Author: Eike Rathke
Date: Wed Jul 29 14:00:27 2015 +0200
translate some comments on the fly
Change-Id: Iae8d8da1c39abacb292d92da71ff8e031da43976
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 955a265..d24ea6d 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -169,7 +169,7 @@ ScDBData& ScDBData::operator= (const ScDBData& rData)
bool ScDBData::operator== (const ScDBData& rData) const
{
-// Daten, die nicht in den Params sind
+// Data that is not in sort or query params.
if ( nTable != rData.nTable ||
bDoSize!= rData.bDoSize||
@@ -477,20 +477,20 @@ void ScDBData::UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos)
{
ScRange aRange;
GetArea( aRange );
-SCTAB nTab = aRange.aStart.Tab(); // hat nur eine Tabelle
+SCTAB nTab = aRange.aStart.Tab(); // a database range is
only on one sheet
// anpassen wie die aktuelle Tabelle bei ScTablesHint (tabvwsh5.cxx)
-if ( nTab == nOldPos ) // verschobene Tabelle
+if ( nTab == nOldPos ) // moved sheet
nTab = nNewPos;
-else if ( nOldPos < nNewPos ) // nach hinten
verschoben
+else if ( nOldPos < nNewPos ) // moved to the back
{
-if ( nTab > nOldPos && nTab <= nNewPos )// nachrueckender
Bereich
+if ( nTab > nOldPos && nTab <= nNewPos )// move this sheet
--nTab;
}
-else// nach vorne
verschoben
+else// moved to the front
{
-if ( nTab >= nNewPos && nTab < nOldPos )// nachrueckender
Bereich
+if ( nTab >= nNewPos && nTab < nOldPos )// move this sheet
++nTab;
}
@@ -502,7 +502,7 @@ void ScDBData::UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos)
aRange.aEnd.Col(),aRange.aEnd.Row() );
}
-// MoveTo ist nicht noetig, wenn nur die Tabelle geaendert ist
+// MoveTo() is not necessary if only the sheet changed.
SetModified(bChanged);
@@ -1101,15 +1101,15 @@ ScDBData* ScDBCollection::GetDBNearCursor(SCCOL nCol,
SCROW nRow, SCTAB nTab )
if ( nCol < nStartCol || nCol > nEndCol || nRow < nStartRow ||
nRow > nEndRow )
{
if (!pNearData)
-pNearData = &(*itr);// ersten angrenzenden Bereich
merken
+pNearData = &(*itr);// remember first adjacent area
}
else
-return &(*itr); // nicht "unbenannt" und Cursor
steht wirklich drin
+return &(*itr); // not "unbenannt"/"unnamed" and
cursor within
}
}
if (pNearData)
-return pNearData; // angrenzender, wenn nichts direkt
getroffen
-return pDoc->GetAnonymousDBData(nTab); // "unbenannt" nur
zurueck, wenn sonst nichts gefunden
+return pNearData; // adjacent, if no direct hit
+return pDoc->GetAnonymousDBData(nTab); // "unbenannt"/"unnamed" only if
nothing else
}
bool ScDBCollection::empty() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx
include/svx/svdtrans.hxx | 169 ++-
include/svx/svdxcgv.hxx | 73 ++--
2 files changed, 133 insertions(+), 109 deletions(-)
New commits:
commit 0f2fb06b9e26077568c18e186894c445fb84285b
Author: Philipp Weissenbacher
Date: Tue Jul 28 23:30:19 2015 +0200
fdo#39468 Translate German comments - include/svx
Change-Id: If0591f7cb799568cb61bb506c4e1f65e8bc540ac
Reviewed-on: https://gerrit.libreoffice.org/17390
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index 221b7ad..f70bfed 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -29,20 +29,22 @@
#include
#include
-
-
-// Winkelangaben der DrawingEngine sind 1/100 Degree
-// #i19054# nowhere used, removed // const int nAngleDiv=100;
-// Um Winkel der DrawingEngine mit den Trigonometrischen Funktionen
-// verarbeiten zu koennen, muessen sie zunaest ins Bogenmass umgerechnet
-// werden. Dies gestaltet sich recht einfach mit der folgenden Konstanten
-// nPi180. Sei nAngle ein Winkel in 1/100 Deg so schreibt man z.B.:
+// The DrawingEngine's angles are specified in 1/100th degrees
+// We need to convert these angles to radians, in order to be able
+// to process them with trigonometric functions.
+// This is done, using the constant nPi180.
+//
+// Example usage:
+// nAngle ... is an angle in 1/100 Deg
+//
+// Which is converted, by this:
// double nSin=sin(nAngle*nPi180);
-// Rueckwandlung entsprechend durch Teilen.
+//
+// To convert it back, we use divison.
const double nPi=3.14159265358979323846;
-const double nPi180=0.00017453292519943295769; // Bei zuweing Stellen ist
tan(4500*nPi180)!=1.0
+const double nPi180=0.00017453292519943295769; // If we have too few
digits, we get tan(4500*nPi180)!=1.0
-// Der maximale Shearwinkel
+// That maximum shear angle
#define SDRMAXSHEAR 8900
class XPolygon;
@@ -74,15 +76,21 @@ inline void ShearPoint(Point& rPnt, const Point& rRef,
double tn, bool bVShear =
SVX_DLLPUBLIC void ShearPoly(Polygon& rPoly, const Point& rRef, double tn,
bool bVShear = false);
void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear =
false);
-// rPnt.X bzw rPnt.Y wird auf rCenter.X bzw. rCenter.Y gesetzt!
-// anschliessend muss rPnt nur noch um rCenter gedreht werden.
-// Der Rueckgabewinkel ist ausnahmsweise in Rad.
+/**
+ * rPnt.X/rPnt.Y is set to rCenter.X or rCenter.Y!
+ * We then only need to rotate rPnt by rCenter.
+ *
+ * @return the returned angle is in rad
+ */
inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point&
rRad, bool bVertical);
-// Die folgenden Methoden behandeln einen Punkt eines XPolygons, wobei die
-// benachbarten Kontrollpunkte des eigentlichen Punktes ggf. in pC1/pC2
-// uebergeben werden. Ueber rSin/rCos wird gleichzeitig sin(nAngle) und
cos(nAngle)
-// zurueckgegeben.
-// Der Rueckgabewinkel ist hier ebenfalls in Rad.
+
+/**
+ * The following methods accept a point of an XPolygon, whereas the
neighbouring
+ * control points of the actual point are passed in pC1/pC2.
+ * Via rSin/rCos, sin(nAngle) and cos(nAngle) are returned.
+ *
+ * @return the returned angle is in rad
+ */
double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point&
rCenter,
const Point& rRad, double& rSin, double& rCos, bool
bVert);
double CrookSlantXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point&
rCenter,
@@ -131,8 +139,8 @@ inline void ShearPoint(Point& rPnt, const Point& rRef,
double tn, bool bVShear)
if (rPnt.Y()!=rRef.Y()) { // sonst nicht noetig
rPnt.X()-=Round((rPnt.Y()-rRef.Y())*tn);
}
-} else { // ansonsten vertikal
-if (rPnt.X()!=rRef.X()) { // sonst nicht noetig
+} else { // or else vertical
+if (rPnt.X()!=rRef.X()) { // else not needed
rPnt.Y()-=Round((rPnt.X()-rRef.X())*tn);
}
}
@@ -156,62 +164,75 @@ inline double GetCrookAngle(Point& rPnt, const Point&
rCenter, const Point& rRad
/**/
/**/
-// Y-Achse zeigt nach unten! Die Funktion negiert bei der
-// Winkelberechnung die Y-Achse, sodass GetAngle(Point(0,-1))=90.00deg.
-// GetAngle(Point(0,0)) liefert 0.
-// Der Rueckgabewert liegt im Bereich -180.00..179.99 Degree und
-// ist in 1/100 Degree angegeben.
+/**
+ * The Y axis points down!
+ * The function negates the Y axis, when calculating the angle, such
+ * that GetAngle(Point(0,-1))=90 deg.
+ * GetAngle(Point(0,0)) returns 0.
+ *
+ * @return the returned value is in the range of -180.00..179.99 deg
+ * and is in 1/100 deg units
+ */
SVX_DLLPUBLIC long GetAngle(const Point& rPnt);
-long NormAngle180(long a); // Winkel normalisieren auf -180.00..179.99
[Bug 39468] translate German comments, removing redundant ones
https://bugs.documentfoundation.org/show_bug.cgi?id=39468 --- Comment #190 from Commit Notification --- Philipp Weissenbacher committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=0f2fb06b9e26077568c18e186894c445fb84285b fdo#39468 Translate German comments - include/svx It will be available in 5.1.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/core/tool/dbdata.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 7ab9a047fc478bcd547259f1bed05dbb3a28d654
Author: Eike Rathke
Date: Wed Jul 29 13:35:56 2015 +0200
TableRef: restoring column names in UpdateMoveTab() is now unnecessary
Change-Id: I2cd444370613e8c890126df41ecfd69e110a555e
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 5573fa7..955a265 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -497,11 +497,9 @@ void ScDBData::UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos)
bool bChanged = ( nTab != aRange.aStart.Tab() );
if (bChanged)
{
-// Save and restore column names, as SetArea() invalidates them.
-::std::vector aNames( maTableColumnNames);
+// Same column range, SetArea() does not invalidate column names.
SetArea( nTab, aRange.aStart.Col(), aRange.aStart.Row(),
-aRange.aEnd.Col(),aRange.aEnd .Row() );
-maTableColumnNames = aNames;
+aRange.aEnd.Col(),aRange.aEnd.Row() );
}
// MoveTo ist nicht noetig, wenn nur die Tabelle geaendert ist
commit d55a6d6d1f9be6b33541d82e57d2397a367c1c43
Author: Eike Rathke
Date: Wed Jul 29 13:25:57 2015 +0200
TableRef: invalidate column names/offsets only if column span differs
Change-Id: I210323612e2aece7cc0bb8705396e3e6503c1260
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 92c47e5..5573fa7 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -276,7 +276,8 @@ void ScDBData::GetArea(ScRange& rRange) const
void ScDBData::SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2)
{
-::std::vector().swap( maTableColumnNames);// invalidate
column names/offsets
+if (nCol2 - nCol1 != nEndCol - nStartCol)
+::std::vector().swap( maTableColumnNames);// invalidate
column names/offsets
nTable = nTab;
nStartCol = nCol1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/gdi/salgdi3.cxx | 36 +---
1 file changed, 1 insertion(+), 35 deletions(-)
New commits:
commit ef6fa18ffca3ad1b5cc55dc07b922803c4551b6f
Author: Tor Lillqvist
Date: Wed Jul 29 14:44:24 2015 +0300
AddFontResourceExW exists since Windows 2000
Change-Id: If81b165bf910661a2742ab4fd5123ad8b97ae7d2
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 76cbc22..2e3c44a 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1821,40 +1821,13 @@ struct TempFontItem
TempFontItem* mpNextItem;
};
-#ifdef FR_PRIVATE
-static int WINAPI __AddFontResourceExW( LPCWSTR lpszfileName, DWORD fl, PVOID
pdv )
-{
-typedef int (WINAPI *AddFontResourceExW_FUNC)(LPCWSTR, DWORD, PVOID );
-
-static AddFontResourceExW_FUNC pFunc = NULL;
-static HMODULE hmGDI = NULL;
-
-if ( !pFunc && !hmGDI )
-{
-hmGDI = GetModuleHandleA( "GDI32" );
-if ( hmGDI )
-pFunc = reinterpret_cast( GetProcAddress(
hmGDI, "AddFontResourceExW" ) );
-}
-
-if ( pFunc )
-return pFunc( lpszfileName, fl, pdv );
-else
-{
-SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-return 0;
-}
-}
-#endif
-
bool ImplAddTempFont( SalData& rSalData, const OUString& rFontFileURL )
{
int nRet = 0;
OUString aUSytemPath;
OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL,
aUSytemPath ) );
-#ifdef FR_PRIVATE
-nRet = __AddFontResourceExW(
reinterpret_cast(aUSytemPath.getStr()), FR_PRIVATE, NULL );
-#endif
+nRet = AddFontResourceExW(
reinterpret_cast(aUSytemPath.getStr()), FR_PRIVATE, NULL );
if ( !nRet )
{
@@ -1911,13 +1884,6 @@ void ImplReleaseTempFonts( SalData& rSalData )
rSalData.mpTempFontItem = p->mpNextItem;
delete p;
}
-
-#ifndef FR_PRIVATE
-// notify every other application
-// unless the temp fonts were installed as private fonts
-if( nCount > 0 )
-PostMessageW( HWND_BROADCAST, WM_FONTCHANGE, 0, NULL );
-#endif // FR_PRIVATE
}
static bool ImplGetFontAttrFromFile( const OUString& rFontFileURL,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source animations/source qadevOOo/tests reportbuilder/java sc/qa
0 files changed New commits: commit 395d922f58c1aa604b4c40dc3055b71dfaf47cb8 Author: Tor Lillqvist Date: Wed Jul 29 14:13:16 2015 +0300 chmod -x Change-Id: I4a248b59e12587c3b2ce79676fdce29a348b6751 diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx old mode 100755 new mode 100644 diff --git a/accessibility/source/extended/accessibletablistbo
[Libreoffice-commits] core.git: configure.ac
0 files changed New commits: commit 705e830dd63f1dc2676c96112564531bc9f391a7 Author: Tor Lillqvist Date: Wed Jul 29 14:11:28 2015 +0300 chmod -x Change-Id: Iad82493025bfb3863a3e073938e25f24cbd7a41f diff --git a/configure.ac b/configure.ac old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ef8ddd22a9f434fc4de1f4b212ff2467676f576c Author: David Ostrovsky Date: Mon Jul 27 08:02:15 2015 +0200 Fix -showIncludes generation on MSVC 14.0 Change-Id: I486b2fc9b4d538ac59d4ced41f2c1726d1ad0dfa Reviewed-on: https://gerrit.libreoffice.org/17358 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/configure.ac b/configure.ac old mode 100644 new mode 100755 index ed35010..c97617a --- a/configure.ac +++ b/configure.ac @@ -3696,7 +3696,7 @@ if test "$_os" = "WINNT"; then dnl localized AC_MSG_CHECKING([the dependency generation prefix (cl.exe -showIncludes)]) echo "#include " > conftest.c -SHOWINCLUDES_PREFIX=`$CC -c -showIncludes conftest.c 2>/dev/null | \ +SHOWINCLUDES_PREFIX=`$CC $CFLAGS -c -showIncludes conftest.c 2>/dev/null | \ grep 'stdlib\.h' | head -n1 | sed 's/ [[[:alpha:]]]:.*//'` rm -f conftest.c conftest.obj if test -z "$SHOWINCLUDES_PREFIX"; then ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Patch: Fix bug 90222 - Replace ScaList with std container
(I'm having trouble with logerrit)
This replaces the ScaList class used in scaddins with/source with std::vector.
Odd issues:
- I've written a wrap around to std::vector since the original
ScaFuncDataList class would generate its contents in the constructor and
supported looking contents up by name.
- ScaList, ScaOUStringList and ScaFuncDataList were all defined twice. This
patch has maintained doubling up the wrapper class for the moment.
--
Ryan McCoskrie
North Canterbury, New Zealanddiff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 64679ff..3de398d 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -35,38 +35,6 @@ using namespace ::com::sun::star;
#define STR_FROM_ANSI( s ) OUString( s, strlen( s ), RTL_TEXTENCODING_MS_1252 )
-const sal_uInt32 ScaList::nStartSize = 16;
-const sal_uInt32 ScaList::nIncrSize = 16;
-
-ScaList::ScaList() :
-pData( new void*[ nStartSize ] ),
-nSize( nStartSize ),
-nCount( 0 ),
-nCurr( 0 )
-{
-}
-
-ScaList::~ScaList()
-{
-delete[] pData;
-}
-
-void ScaList::_Grow()
-{
-nSize += nIncrSize;
-
-void** pNewData = new void*[ nSize ];
-memcpy( pNewData, pData, nCount * sizeof( void* ) );
-
-delete[] pData;
-pData = pNewData;
-}
-
-ScaStringList::~ScaStringList()
-{
-for( OUString* pStr = First(); pStr; pStr = Next() )
-delete pStr;
-}
ScaResId::ScaResId( sal_uInt16 nId, ResMgr& rResMgr ) :
ResId( nId, rResMgr )
@@ -109,7 +77,7 @@ ScaFuncData::ScaFuncData( const ScaFuncDataBase& rBaseData, ResMgr& rResMgr ) :
const ResStringArray& rArr = aArrLoader.GetStringArray();
for( sal_uInt32 nIndex = 0; nIndex < rArr.Count(); nIndex++ )
-aCompList.Append( rArr.GetString( nIndex ) );
+aCompList.push_back( rArr.GetString( nIndex ) );
}
ScaFuncData::~ScaFuncData()
@@ -125,31 +93,30 @@ sal_uInt16 ScaFuncData::GetStrIndex( sal_uInt16 nParam ) const
ScaFuncDataList::ScaFuncDataList( ResMgr& rResMgr ) :
-nLast( 0x )
+nLast( contents.begin() )
{
for( sal_uInt16 nIndex = 0; nIndex < SAL_N_ELEMENTS(pFuncDataArr); nIndex++ )
-Append( new ScaFuncData( pFuncDataArr[ nIndex ], rResMgr ) );
+contents.push_back( new ScaFuncData( pFuncDataArr[ nIndex ], rResMgr ) );
}
ScaFuncDataList::~ScaFuncDataList()
{
-for( ScaFuncData* pFData = First(); pFData; pFData = Next() )
-delete pFData;
+for( std::vector::iterator it = contents.begin(); it != contents.end(); ++it )
+delete *nLast;
}
-const ScaFuncData* ScaFuncDataList::Get( const OUString& rProgrammaticName ) const
+const ScaFuncData* ScaFuncDataList::Get( const OUString& rProgrammaticName )
{
if( aLastName == rProgrammaticName )
-return Get( nLast );
+return *nLast;
-for( sal_uInt32 nIndex = 0; nIndex < Count(); nIndex++ )
+for( std::vector::iterator it = contents.begin(); it != contents.end(); ++it )
{
-const ScaFuncData* pCurr = Get( nIndex );
-if( pCurr->Is( rProgrammaticName ) )
+if( (*it)->Is( rProgrammaticName ) )
{
-const_cast< ScaFuncDataList* >( this )->aLastName = rProgrammaticName;
-const_cast< ScaFuncDataList* >( this )->nLast = nIndex;
-return pCurr;
+aLastName = rProgrammaticName;
+nLast = it;
+return *it;
}
}
return NULL;
@@ -446,13 +413,13 @@ uno::Sequence< sheet::LocalizedName > SAL_CALL ScaDateAddIn::getCompatibilityNam
return uno::Sequence< sheet::LocalizedName >( 0 );
const ScaStringList& rStrList = pFData->GetCompNameList();
-sal_uInt32 nCount = rStrList.Count();
+sal_uInt32 nCount = rStrList.size();
uno::Sequence< sheet::LocalizedName > aRet( nCount );
sheet::LocalizedName* pArray = aRet.getArray();
for( sal_uInt32 nIndex = 0; nIndex < nCount; nIndex++ )
-pArray[ nIndex ] = sheet::LocalizedName( GetLocale( nIndex ), *rStrList.Get( nIndex ) );
+pArray[ nIndex ] = sheet::LocalizedName( GetLocale( nIndex ), rStrList[nIndex] );
return aRet;
}
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index 9922bdf..e2271a0 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -35,86 +35,8 @@
#include
#include
-class ScaList
-{
-private:
-static const sal_uInt32 nStartSize;
-static const sal_uInt32 nIncrSize;
-
-void** pData; // pointer array
-sal_uInt32 nSize; // array size
-sal_uInt32 nCount; // next index to be inserted at
-sal_uInt32 nCurr; // current pos for iterations
-
-void_Grow();
-inline void Grow();
-
-public:
-ScaList();
-virtual
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/inc sw/source
sw/inc/pagepreviewlayout.hxx |5 +
sw/inc/viewsh.hxx |1 +
sw/source/core/view/pagepreviewlayout.cxx | 24
sw/source/uibase/uiview/pview.cxx |2 ++
4 files changed, 32 insertions(+)
New commits:
commit 0deff9044cd0c21a4caf1df2df13d9a1b5cecff2
Author: Miklos Vajna
Date: Tue Jul 28 09:57:31 2015 +0200
tdf#92914 SwPagePreviewLayout::Paint: handle rendercontext
With this, the print preview window no longer performs direct paint.
(cherry picked from commit 46e7991be05a39a24e0a559db6ff1aea0ebc14e5)
Conflicts:
sw/inc/pagepreviewlayout.hxx
Change-Id: I53f05d8a3b723bc131f21a485e0ffec71484670a
Reviewed-on: https://gerrit.libreoffice.org/17394
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx
index b81afd7..78fb676 100644
--- a/sw/inc/pagepreviewlayout.hxx
+++ b/sw/inc/pagepreviewlayout.hxx
@@ -575,6 +575,11 @@ public:
@author FME
*/
sal_uInt16 GetNumberOfPreviewPages() { return sal::static_int_cast<
sal_uInt16 >(maPreviewPages.size()); }
+
+SwViewShell& GetParentViewShell()
+{
+return mrParentViewShell;
+}
};
#endif // INCLUDED_SW_INC_PAGEPREVIEWLAYOUT_HXX
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 5f7a9ce..763af50 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -357,6 +357,7 @@ public:
inline vcl::RenderContext* GetOut() const { return mpOut; }
void SetWin(vcl::Window* win) { mpWin = win; }
+void SetOut(vcl::RenderContext* pOut) { mpOut = pOut; }
static inline bool IsLstEndAction() { return SwViewShell::mbLstAct; }
// Change of all page descriptors.
diff --git a/sw/source/core/view/pagepreviewlayout.cxx
b/sw/source/core/view/pagepreviewlayout.cxx
index 4baed4f..26ff858 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -984,12 +984,36 @@ SwTwips SwPagePreviewLayout::GetWinPagesScrollAmount(
// methods to paint page preview layout
+namespace
+{
+/// Similar to RenderContextGuard, but does not touch the draw view.
+class PreviewRenderContextGuard
+{
+VclPtr m_pOriginalValue;
+SwViewShell& m_rShell;
+
+public:
+PreviewRenderContextGuard(SwViewShell& rShell, vcl::RenderContext* pValue)
+: m_pOriginalValue(rShell.GetOut()),
+m_rShell(rShell)
+{
+m_rShell.SetOut(pValue);
+}
+
+~PreviewRenderContextGuard()
+{
+m_rShell.SetOut(m_pOriginalValue);
+}
+};
+}
+
/** paint prepared preview
OD 12.12.2002 #103492#
*/
bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const
Rectangle& rOutRect) const
{
+PreviewRenderContextGuard aGuard(mrParentViewShell, &rRenderContext);
// check environment and parameters
{
if (!mrParentViewShell.GetWin() &&
!mrParentViewShell.GetOut()->GetConnectMetaFile())
diff --git a/sw/source/uibase/uiview/pview.cxx
b/sw/source/uibase/uiview/pview.cxx
index 1d9fd38..83fe028 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -234,7 +234,9 @@ void SwPagePreviewWin::Paint(vcl::RenderContext&
rRenderContext, const Rectangl
aMM.SetScaleX(maScale);
aMM.SetScaleY(maScale);
rRenderContext.SetMapMode(aMM);
+mpPgPreviewLayout->GetParentViewShell().setOutputToWindow(true);
mpPgPreviewLayout->Paint(rRenderContext, rRect);
+mpPgPreviewLayout->GetParentViewShell().setOutputToWindow(false);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild
RepositoryExternal.mk |4 solenv/gbuild/LinkTarget.mk |8 2 files changed, 12 insertions(+) New commits: commit d9162d24ce242f27f9cc0430f0650daac8e5db24 Author: Michael Stahl Date: Wed Jul 29 12:17:03 2015 +0200 RepositoryExternal.mk: for some reason Mac wants a GeneratedPackage Change-Id: I5d983fee8d5cd313fbd0d6ece800fa8b80d81b35 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 28acf9c..7c87f5e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3170,7 +3170,11 @@ endef define gb_LinkTarget__use_python $(call gb_LinkTarget__use_python_headers,$(1)) +ifeq ($(OS),MACOSX) +$(call gb_LinkTarget_use_generated_package,$(1),python3) +else $(call gb_LinkTarget_use_package,$(1),python3) +endif ifeq ($(OS),WNT) $(call gb_LinkTarget_add_libs,$(1),\ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 49bd40b..b4b9060 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1301,6 +1301,14 @@ define gb_LinkTarget_use_packages $(foreach package,$(2),$(call gb_LinkTarget_use_package,$(1),$(package))) endef +# use a GeneratedPackage, possibly from another module +# call gb_LinkTarget_use_generated_package,linktarget,package +define gb_LinkTarget_use_generated_package +$(call gb_LinkTarget_get_headers_target,$(1)) :| \ + $(call gb_GeneratedPackage_get_target,$(strip $(2))) + +endef + # Use sources from unpacked tarball of an external project # call gb_LinkTarget_use_unpacked,linktarget,unpackedtarget define gb_LinkTarget_use_unpacked ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 88 +++-
sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 10 +
sc/source/ui/view/formatsh.cxx |1
sc/uiconfig/scalc/ui/sidebaralignment.ui| 131
4 files changed, 210 insertions(+), 20 deletions(-)
New commits:
commit b763f33f14ca7433370512a0d12307f2ff01e5d6
Author: Rishabh Kumar
Date: Thu Jul 23 04:03:17 2015 +0530
tdf#91802: Add reference edge to text orientation
Addition of reference edge and vertically stacked checkbox to
the Alignment sidebar tab in Calc
Change-Id: I62ba4145a33cf637d1d5f1f08b3f3f01e4165571
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index d572ffd..66c5fc9 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -21,9 +21,11 @@
#include
#include "sc.hrc"
#include "scresid.hxx"
+#include "scitems.hxx"
#include
#include
#include
+#include
#include
#include
#include
@@ -45,6 +47,8 @@ AlignmentPropertyPanel::AlignmentPropertyPanel(
maMergeCellControl(FID_MERGE_TOGGLE, *pBindings, *this),
maWrapTextControl(SID_ATTR_ALIGN_LINEBREAK, *pBindings, *this),
maAngleControl(SID_ATTR_ALIGN_DEGREES, *pBindings, *this),
+ maVrtStackControl(SID_ATTR_ALIGN_STACKED, *pBindings, *this),
+ maRefEdgeControl(SID_ATTR_ALIGN_LOCKPOS, *pBindings, *this),
mbMultiDisable(false),
mxFrame(rxFrame),
maContext(),
@@ -56,6 +60,11 @@ AlignmentPropertyPanel::AlignmentPropertyPanel(
get(mpCBXMergeCell, "mergecells");
get(mpFtRotate, "orientationlabel");
get(mpMtrAngle, "orientationdegrees");
+get(mpRefEdgeBottom, "bottom");
+get(mpRefEdgeTop, "top");
+get(mpRefEdgeStd, "standard");
+get(mpCBStacked, "stacked");
+get(mpTextOrientBox , "textorientbox");
Initialize();
@@ -76,12 +85,19 @@ void AlignmentPropertyPanel::dispose()
mpCBXMergeCell.clear();
mpFtRotate.clear();
mpMtrAngle.clear();
+mpCBStacked.clear();
+mpRefEdgeBottom.clear();
+mpRefEdgeTop.clear();
+mpRefEdgeStd.clear();
+mpTextOrientBox.clear();
maAlignHorControl.dispose();
maLeftIndentControl.dispose();
maMergeCellControl.dispose();
maWrapTextControl.dispose();
maAngleControl.dispose();
+maVrtStackControl.dispose();
+maRefEdgeControl.dispose();
PanelLayout::dispose();
}
@@ -100,14 +116,16 @@ void AlignmentPropertyPanel::Initialize()
aLink = LINK(this, AlignmentPropertyPanel, CBOXWrapTextClkHdl);
mpCBXWrapText->SetClickHdl ( aLink );
-//rotation control
-
//rotation
mpMtrAngle->SetAccessibleName(OUString( "Text Orientation")); //wj acc
mpMtrAngle->SetModifyHdl(LINK( this, AlignmentPropertyPanel,
AngleModifiedHdl));
mpMtrAngle->EnableAutocomplete( false );
+mpCBStacked->SetClickHdl(LINK(this, AlignmentPropertyPanel,
ClickStackHdl));
-//Vertical stacked
+aLink = LINK(this, AlignmentPropertyPanel, ReferenceEdgeHdl);
+mpRefEdgeBottom->SetClickHdl(aLink);
+mpRefEdgeTop->SetClickHdl(aLink);
+mpRefEdgeStd->SetClickHdl(aLink);
mpMtrAngle->InsertValue(0, FUNIT_CUSTOM);
mpMtrAngle->InsertValue(45, FUNIT_CUSTOM);
@@ -123,6 +141,20 @@ void AlignmentPropertyPanel::Initialize()
mpMtrAngle->SetAccessibleRelationLabeledBy(mpFtRotate);
}
+IMPL_LINK( AlignmentPropertyPanel, ReferenceEdgeHdl, Control*, pControl )
+{
+SvxRotateMode eMode;
+if(pControl == mpRefEdgeBottom)
+eMode = SVX_ROTATE_MODE_BOTTOM;
+else if(pControl == mpRefEdgeTop)
+eMode = SVX_ROTATE_MODE_TOP;
+else
+eMode = SVX_ROTATE_MODE_STANDARD;
+SvxRotateModeItem aItem(eMode,ATTR_ROTATE_MODE);
+GetBindings()->GetDispatcher()->Execute(SID_ATTR_ALIGN_LOCKPOS,
SfxCallMode::RECORD, &aItem, 0l);
+return 0;
+}
+
IMPL_LINK_NOARG( AlignmentPropertyPanel, AngleModifiedHdl )
{
OUString sTmp = mpMtrAngle->GetText();
@@ -161,6 +193,14 @@ IMPL_LINK_NOARG( AlignmentPropertyPanel, AngleModifiedHdl )
SID_ATTR_ALIGN_DEGREES, SfxCallMode::RECORD, &aAngleItem, 0L );
return 0;
}
+IMPL_LINK_NOARG( AlignmentPropertyPanel, ClickStackHdl )
+{
+bool bVertical = mpCBStacked->IsChecked();
+SfxBoolItem aStackItem( SID_ATTR_ALIGN_STACKED, bVertical );
+GetBindings()->GetDispatcher()->Execute(
+SID_ATTR_ALIGN_STACKED, SfxCallMode::RECORD, &aStackItem, 0L );
+return 0;
+}
IMPL_LINK_NOARG(AlignmentPropertyPanel, MFLeftIndentMdyHdl)
{
mpCBXWrapText->EnableTriState(false);
@@ -314,6 +354,48 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
}
}
break;
+case SID_ATTR_ALIGN_STACKED:
+if (eState >= SfxItemState::DEFAULT)
+{
+mpCBStacked->EnableTriState(false);
+const SfxBoolItem* aStackItem = static_cast(pState);
+m
[Libreoffice-commits] core.git: basic/source
basic/source/comp/io.cxx | 14 +++---
basic/source/inc/iosys.hxx| 37 +++--
basic/source/runtime/iosys.cxx|6 +++---
basic/source/runtime/methods1.cxx |4 ++--
basic/source/runtime/runtime.cxx |2 +-
5 files changed, 36 insertions(+), 27 deletions(-)
New commits:
commit c2ac8569dea545d75376a7840ed9d8d0792f2aec
Author: Noel Grandin
Date: Tue Jul 28 15:04:53 2015 +0200
convert SBSTRM constants to scoped enum
Change-Id: I478a9c7eca6509baf3e9a3dd3ce3dd8f3060f842
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index 45b3caf..4a2f2db 100644
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -174,19 +174,19 @@ void SbiParser::Open()
SbiToken eTok;
TestToken( FOR );
StreamMode nMode = StreamMode::NONE;
-short nFlags = 0;
+SbiStreamFlags nFlags = SbiStreamFlags::NONE;
switch( Next() )
{
case INPUT:
-nMode = StreamMode::READ; nFlags |= SBSTRM_INPUT; break;
+nMode = StreamMode::READ; nFlags |= SbiStreamFlags::Input; break;
case OUTPUT:
-nMode = StreamMode::WRITE | StreamMode::TRUNC; nFlags |=
SBSTRM_OUTPUT; break;
+nMode = StreamMode::WRITE | StreamMode::TRUNC; nFlags |=
SbiStreamFlags::Output; break;
case APPEND:
-nMode = StreamMode::WRITE; nFlags |= SBSTRM_APPEND; break;
+nMode = StreamMode::WRITE; nFlags |= SbiStreamFlags::Append; break;
case RANDOM:
-nMode = StreamMode::READ | StreamMode::WRITE; nFlags |=
SBSTRM_RANDOM; break;
+nMode = StreamMode::READ | StreamMode::WRITE; nFlags |=
SbiStreamFlags::Random; break;
case BINARY:
-nMode = StreamMode::READ | StreamMode::WRITE; nFlags |=
SBSTRM_BINARY; break;
+nMode = StreamMode::READ | StreamMode::WRITE; nFlags |=
SbiStreamFlags::Binary; break;
default:
Error( ERRCODE_BASIC_SYNTAX );
}
@@ -262,7 +262,7 @@ void SbiParser::Open()
if( pChan )
pChan->Gen();
aFileName.Gen();
-aGen.Gen( _OPEN, static_cast(nMode), nFlags );
+aGen.Gen( _OPEN, static_cast(nMode),
static_cast(nFlags) );
bInStatement = false;
}
diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx
index 85c29ca..a7e7398 100644
--- a/basic/source/inc/iosys.hxx
+++ b/basic/source/inc/iosys.hxx
@@ -22,6 +22,7 @@
#include
#include
+#include
class SvStream;
@@ -30,11 +31,19 @@ class SvStream;
#define CHANNELS 256
-#define SBSTRM_INPUT0x0001
-#define SBSTRM_OUTPUT 0x0002
-#define SBSTRM_RANDOM 0x0004
-#define SBSTRM_APPEND 0x0008
-#define SBSTRM_BINARY 0x0010
+enum class SbiStreamFlags
+{
+NONE = 0x,
+Input= 0x0001,
+Output = 0x0002,
+Random = 0x0004,
+Append = 0x0008,
+Binary = 0x0010,
+};
+namespace o3tl
+{
+template<> struct typed_flags :
is_typed_flags {};
+}
class SbiStream
{
@@ -43,7 +52,7 @@ class SbiStream
OString aLine;
sal_uIntPtr nLine;
short nLen;// buffer length
-short nMode;
+SbiStreamFlags nMode;
short nChan;
SbError nError;
void MapError();
@@ -51,19 +60,19 @@ class SbiStream
public:
SbiStream();
~SbiStream();
-SbError Open( short, const OString&, StreamMode, short, short );
+SbError Open( short, const OString&, StreamMode, SbiStreamFlags, short );
SbError Close();
SbError Read(OString&, sal_uInt16 = 0, bool bForceReadingPerByte=false);
SbError Read( char& );
SbError Write( const OString&, sal_uInt16 = 0 );
-bool IsText() const { return (nMode & SBSTRM_BINARY) == 0; }
-bool IsRandom() const { return (nMode & SBSTRM_RANDOM) != 0; }
-bool IsBinary() const { return (nMode & SBSTRM_BINARY) != 0; }
-bool IsSeq() const { return (nMode & SBSTRM_RANDOM) == 0; }
-bool IsAppend() const { return (nMode & SBSTRM_APPEND) != 0; }
+bool IsText() const { return !bool(nMode & SbiStreamFlags::Binary); }
+bool IsRandom() const { return bool(nMode & SbiStreamFlags::Random); }
+bool IsBinary() const { return bool(nMode & SbiStreamFlags::Binary); }
+bool IsSeq() const { return !bool(nMode & SbiStreamFlags::Random); }
+bool IsAppend() const { return bool(nMode & SbiStreamFlags::Append); }
short GetBlockLen() const { return nLen; }
-short GetMode() const { return nMode; }
+SbiStreamFlags GetMode() const { return nMode; }
sal_uIntPtr GetLine() const{ return nLine; }
void SetExpandOnWriteTo( sal_uIntPtr n ) { nExpandOnWriteTo = n;}
void ExpandFile();
@@ -89,7 +98,7 @@ public:
void SetChannel( short n ) { nChan = n; }
short GetChannel() const { return nChan;}
void ResetChannel() { nChan = 0; }
-void Op
[Libreoffice-commits] core.git: include/osl
include/osl/endian.h |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6484b2fda3b4fa0059526e81cd1e26cca46cb705
Author: Matteo Casalin
Date: Tue Jul 21 22:56:56 2015 +0200
endian.h: avoid some Wconversion warnings
Change-Id: Ic77bd0dd6ac2355eaf3e11811fba7604c782d9d6
Reviewed-on: https://gerrit.libreoffice.org/17307
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/include/osl/endian.h b/include/osl/endian.h
index 0819dee..5305493 100644
--- a/include/osl/endian.h
+++ b/include/osl/endian.h
@@ -161,7 +161,7 @@ extern "C" {
#endif
#ifndef OSL_MAKEWORD
-# define OSL_MAKEWORD(bl, bh)((sal_uInt16)((bl) & 0xFF) |
(((sal_uInt16)(bh) & 0xFF) << 8))
+# define OSL_MAKEWORD(bl, bh)((sal_uInt16)((sal_uInt16)((bl) & 0xFF) |
(((sal_uInt16)(bh) & 0xFF) << 8)))
#endif
#ifndef OSL_LOBYTE
# define OSL_LOBYTE(w) ((sal_uInt8)((sal_uInt16)(w) & 0xFF))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/tools
include/tools/solar.h | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 029fa6477bfed71881c3287799f5bdffd3285f92
Author: Matteo Casalin
Date: Wed Jul 22 23:22:56 2015 +0200
solar.h: avoid some Wconversion warnings
Change-Id: Id41bd4e759dea72b37db5f329e29ff5c18c75a66
Reviewed-on: https://gerrit.libreoffice.org/17306
Tested-by: Jenkins
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/include/tools/solar.h b/include/tools/solar.h
index c8d83ac..717ad78 100644
--- a/include/tools/solar.h
+++ b/include/tools/solar.h
@@ -47,12 +47,14 @@ typedef sal_uInt8 SVBT64[8];
#ifdef __cplusplus
-inline sal_uInt16 SVBT16ToShort( const SVBT16 p ) { return (sal_uInt16)p[0]
- + ((sal_uInt16)p[1] << 8);
}
-inline sal_uInt32 SVBT32ToUInt32 ( const SVBT32 p ) { return (sal_uInt32)p[0]
+inline sal_uInt16 SVBT16ToShort( const SVBT16 p ) { return
static_cast
+ ((sal_uInt16)p[0]
+ + ((sal_uInt16)p[1] <<
8)); }
+inline sal_uInt32 SVBT32ToUInt32 ( const SVBT32 p ) { return
static_cast
+ ((sal_uInt32)p[0]
+ ((sal_uInt32)p[1] << 8)
+ ((sal_uInt32)p[2] << 16)
- + ((sal_uInt32)p[3] << 24);
}
+ + ((sal_uInt32)p[3] <<
24)); }
#if defined OSL_LITENDIAN
inline double SVBT64ToDouble( const SVBT64 p ) { double n;
reinterpret_cast(&n)[0] = p[0];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - svtools/source
svtools/source/control/breadcrumb.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 286cc57c9a31695b51845ca7932d795731619cb9 Author: Szymon KÅos Date: Wed Jul 29 11:09:44 2015 +0200 path must contain user name Change-Id: Ic8c98e724645d49fd9c6da796f9e060aa784246f diff --git a/svtools/source/control/breadcrumb.cxx b/svtools/source/control/breadcrumb.cxx index 5ae725d..53e1780 100644 --- a/svtools/source/control/breadcrumb.cxx +++ b/svtools/source/control/breadcrumb.cxx @@ -74,8 +74,12 @@ void Breadcrumb::SetURL( const OUString& rURL ) INetURLObject aURL( rURL ); aURL.setFinalSlash(); +OUString sUser = aURL.GetUser( INetURLObject::NO_DECODE ); OUString sPath = aURL.GetURLPath(INetURLObject::DECODE_WITH_CHARSET); -OUString sRootPath = INetURLObject::GetScheme( aURL.GetProtocol() ) + aURL.GetHost(); +OUString sRootPath = INetURLObject::GetScheme( aURL.GetProtocol() ) ++ sUser ++ ( sUser.isEmpty() ? OUString() : "@" ) ++ aURL.GetHost(); int nSegments = aURL.getSegmentCount(); unsigned int nPos = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 57dd4d01c1ba036e5da4abf986b8d594d0ccdb95 Author: Michael Stahl Date: Wed Jul 29 10:56:57 2015 +0200 RepositoryExternal.mk: missing dependency on python3 package This was causing all these "libpython3.3m.so: file not recognized: File truncated" failures. Change-Id: Ib814ab4fa43d9c8f20cf9b16ad04e1a71057e595 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 7398916..28acf9c 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3170,6 +3170,7 @@ endef define gb_LinkTarget__use_python $(call gb_LinkTarget__use_python_headers,$(1)) +$(call gb_LinkTarget_use_package,$(1),python3) ifeq ($(OS),WNT) $(call gb_LinkTarget_add_libs,$(1),\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/tools
include/tools/errcode.hxx | 193 +++--- 1 file changed, 98 insertions(+), 95 deletions(-) New commits: commit 5e6ec5bb145a7223281efd46c659a10fc5a59b58 Author: Matteo Casalin Date: Tue Jul 21 22:57:43 2015 +0200 errcode.hxx: avoid some Wconversion warnings Change-Id: I48bb49c7eb472fa493fca71736acc358151e87ac Reviewed-on: https://gerrit.libreoffice.org/17308 Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/include/tools/errcode.hxx b/include/tools/errcode.hxx index 9914960..0df5e30 100644 --- a/include/tools/errcode.hxx +++ b/include/tools/errcode.hxx @@ -22,6 +22,9 @@ #ifndef __RSC #include +#define CAST_TO_UINT32(a) ((sal_uInt32)(a)) +#else +#define CAST_TO_UINT32(a) (a) #endif /* @@ -70,11 +73,11 @@ Warning || || | #define ERRCODE_AREA_SHIFT13 #define ERRCODE_DYNAMIC_SHIFT 26 -#define ERRCODE_CLASS_MASK(31UL
[Libreoffice-commits] online.git: 3 commits - loleaflet/src loolwsd/LOOLSession.cpp
loleaflet/src/layer/tile/GridLayer.js | 31 ++-
loleaflet/src/layer/tile/TileLayer.js | 39 +-
loleaflet/src/map/handler/Map.Keyboard.js |1
loleaflet/src/map/handler/Map.Mouse.js|1
loolwsd/LOOLSession.cpp |9 +++---
5 files changed, 48 insertions(+), 33 deletions(-)
New commits:
commit a6091f9f6bb20a72b0f7e6e985e172c0790e8252
Author: Mihai Varga
Date: Wed Jul 29 11:39:35 2015 +0300
loolwsd: don't decode the url in the saveAs command
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 737435a..7e029f8 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -982,10 +982,7 @@ bool ChildProcessSession::saveAs(const char *buffer, int
length, StringTokenizer
return false;
}
-URI::decode(url, url, true);
-if (getTokenString(tokens[2], "format", format)) {
-URI::decode(format, format, true);
-}
+getTokenString(tokens[2], "format", format);
if (getTokenString(tokens[3], "options", filterOptions)) {
if (tokens.count() > 4) {
@@ -993,7 +990,9 @@ bool ChildProcessSession::saveAs(const char *buffer, int
length, StringTokenizer
}
}
-_loKitDocument->pClass->saveAs(_loKitDocument, url.c_str(),
format.c_str(), filterOptions.c_str());
+_loKitDocument->pClass->saveAs(_loKitDocument, url.c_str(),
+format.size() == 0 ? NULL :format.c_str(),
+filterOptions.size() == 0 ? NULL : filterOptions.c_str());
return true;
}
commit 932ffaad68cb2934b7e5e3460c5b7b46b6352736
Author: Mihai Varga
Date: Tue Jul 28 12:11:56 2015 +0300
loleaflet: delete invalid tiles outside of the visible area
diff --git a/loleaflet/src/layer/tile/GridLayer.js
b/loleaflet/src/layer/tile/GridLayer.js
index aa1bca6..70f3c10 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -576,6 +576,9 @@ L.GridLayer = L.Layer.extend({
this._tileCache[key] = tile.el.src;
}
+ if (!tile.loaded && this._emptyTilesCount > 0) {
+ this._emptyTilesCount -= 1;
+ }
L.DomUtil.remove(tile.el);
delete this._tiles[key];
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 36534c3..83d489c 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -265,6 +265,9 @@ L.TileLayer = L.GridLayer.extend({
offset = new L.Point(command.width, command.height);
bottomRightTwips = topLeftTwips.add(offset);
var invalidBounds = new L.Bounds(topLeftTwips,
bottomRightTwips);
+ var visibleTopLeft =
this._latLngToTwips(this._map.getBounds().getNorthWest());
+ var visibleBottomRight =
this._latLngToTwips(this._map.getBounds().getSouthEast());
+ var visibleArea = new L.Bounds(visibleTopLeft,
visibleBottomRight);
for (var key in this._tiles) {
var coords = this._tiles[key].coords;
@@ -278,14 +281,21 @@ L.TileLayer = L.GridLayer.extend({
else {
this._tiles[key]._invalidCount
= 1;
}
- this.sendMessage('tile ' +
- 'part='
+ coords.part + ' ' +
-
'width=' + this._tileSize + ' ' +
-
'height=' + this._tileSize + ' ' +
-
'tileposx=' + tileTopLeft.x + ' '+
-
'tileposy=' + tileTopLeft.y + ' ' +
-
'tilewidth=' + this._tileWidthTwips + ' ' +
-
'tileheight=' + this._tileHeightTwips, key);
+ if (visibleArea.intersects(bounds)) {
+ this.sendMessage('tile ' +
+
'part=' + coords.part + ' ' +
+
'width=' + this._tileSize + ' ' +
+
'height=' + this._tileSize + ' ' +
+
'tileposx=' + tileTopLeft.x + ' '+
+
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - ucb/source
ucb/source/ucp/cmis/cmis_content.cxx | 10 --
ucb/source/ucp/cmis/cmis_provider.cxx | 13 +
ucb/source/ucp/cmis/cmis_provider.hxx |6 +++---
ucb/source/ucp/cmis/cmis_url.cxx |9 -
ucb/source/ucp/cmis/cmis_url.hxx |1 +
5 files changed, 29 insertions(+), 10 deletions(-)
New commits:
commit 92e41683dbe657921e99310f1ec4c29aaef2828d
Author: Szymon KÅos
Date: Wed Jul 29 10:18:20 2015 +0200
CMIS: remember new session for each user
Change-Id: I7d0a72e48b8f9056e8761cae8939e2b8f6dbdd24
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index bc77db1..c0b72b6 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -339,7 +339,7 @@ namespace cmis
// Look for a cached session, key is binding url + repo id
OUString sSessionId = m_aURL.getBindingUrl( ) +
m_aURL.getRepositoryId( );
if ( NULL == m_pSession )
-m_pSession = m_pProvider->getSession( sSessionId );
+m_pSession = m_pProvider->getSession( sSessionId,
m_aURL.getUsername( ) );
if ( NULL == m_pSession )
{
@@ -411,7 +411,7 @@ namespace cmis
}
else
{
-m_pProvider->registerSession(sSessionId, m_pSession);
+m_pProvider->registerSession(sSessionId,
m_aURL.getUsername( ), m_pSession);
}
}
else
@@ -2019,14 +2019,20 @@ namespace cmis
{
// TODO Cache the objects
+INetURLObject aURL( m_sURL );
+OUString sUser = aURL.GetUser( INetURLObject::NO_DECODE );
+
URL aUrl( m_sURL );
OUString sPath( m_sObjectPath );
if ( !sPath.endsWith("/") )
sPath += "/";
sPath += STD_TO_OUSTR( ( *it )->getName( ) );
OUString sId = STD_TO_OUSTR( ( *it )->getId( ) );
+
aUrl.setObjectId( sId );
aUrl.setObjectPath( sPath );
+aUrl.setUsername( sUser );
+
uno::Reference< ucb::XContentIdentifier > xId = new
ucbhelper::ContentIdentifier( aUrl.asString( ) );
uno::Reference< ucb::XContent > xContent = new Content(
m_xContext, m_pProvider, xId, *it );
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx
b/ucb/source/ucp/cmis/cmis_provider.cxx
index a41b52c..c9819b5 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -59,10 +59,11 @@ ContentProvider::queryContent(
return xContent;
}
-libcmis::Session* ContentProvider::getSession( const OUString& sBindingUrl )
+libcmis::Session* ContentProvider::getSession( const OUString& sBindingUrl,
const OUString& sUsername )
{
libcmis::Session* pSession = NULL;
-std::map< OUString, libcmis::Session* >::iterator it =
m_aSessionCache.find( sBindingUrl );
+std::map< std::pair< OUString, OUString >, libcmis::Session* >::iterator it
+= m_aSessionCache.find( std::pair< OUString, OUString >(
sBindingUrl, sUsername ) );
if ( it != m_aSessionCache.end( ) )
{
pSession = it->second;
@@ -70,9 +71,13 @@ libcmis::Session* ContentProvider::getSession( const
OUString& sBindingUrl )
return pSession;
}
-void ContentProvider::registerSession( const OUString& sBindingUrl,
libcmis::Session* pSession )
+void ContentProvider::registerSession( const OUString& sBindingUrl, const
OUString& sUsername, libcmis::Session* pSession )
{
-m_aSessionCache.insert( std::pair< OUString, libcmis::Session* >(
sBindingUrl, pSession ) );
+m_aSessionCache.insert( std::pair< std::pair< OUString, OUString >,
libcmis::Session* >
+(
+std::pair< OUString, OUString >( sBindingUrl,
sUsername ),
+pSession
+) );
}
ContentProvider::ContentProvider(
diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx
b/ucb/source/ucp/cmis/cmis_provider.hxx
index efbd439..1dcad0a 100644
--- a/ucb/source/ucp/cmis/cmis_provider.hxx
+++ b/ucb/source/ucp/cmis/cmis_provider.hxx
@@ -20,7 +20,7 @@ namespace cmis
class ContentProvider : public ::ucbhelper::ContentProviderImplHelper
{
private:
-std::map< OUString, libcmis::Session* > m_aSessionCache;
+std::map< std::pair< OUString, OUString >, libcmis::Session* >
m_aSessionCache;
public:
explicit ContentProvider( const ::com::sun::star::uno::Reference<
@@ -64,8 +64,8 @@ public:
throw( ::com::sun::star::ucb::IllegalIdentifierException,
::com::sun::star::uno::RuntimeException, std::exception )
SAL_OVERRIDE;
-libcmis::Session* getSession( const OUString& sBindingUrl );
-void registerSession( const OUString& sBindingUrl, libcmis::Session*
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/gdi/salbmp.cxx | 22 +++---
1 file changed, 15 insertions(+), 7 deletions(-)
New commits:
commit 01d96add97c49607317b51ac64a36c229f9da0ec
Author: Noel Grandin
Date: Wed Jul 29 09:48:43 2015 +0200
fix windows build
after commit b97aa3faa03e5944aac8f3c35a8c198fba295e83
"Remove the unnecessary type definition: HPBYTE"
Change-Id: Ifd73ecb7e923ef38826d24c3d251be29eda472bf
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 52c2878..0147005 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -51,12 +51,20 @@
// - Inlines -
-inline void ImplSetPixel4( const sal_uInt8* pScanline, long nX, const BYTE
cIndex )
+inline void ImplSetPixel4( sal_uInt8* pScanline, long nX, const BYTE cIndex )
{
BYTE& rByte = pScanline[ nX >> 1 ];
-( nX & 1 ) ? ( rByte &= 0xf0, rByte |= ( cIndex & 0x0f ) ) :
- ( rByte &= 0x0f, rByte |= ( cIndex << 4 ) );
+if ( nX & 1 )
+{
+rByte &= 0xf0;
+rByte |= cIndex & 0x0f;
+}
+else
+{
+rByte &= 0x0f;
+rByte |= cIndex << 4;
+}
}
// Helper class to manage Gdiplus::Bitmap instances inside of
@@ -954,11 +962,11 @@ void WinSalBitmap::ImplDecodeRLEBuffer( const BYTE*
pSrcBuf, BYTE* pDstBuf,
sal_uInt8* pRLE = (sal_uInt8*) pSrcBuf;
sal_uInt8* pDIB = (sal_uInt8*) pDstBuf;
sal_uInt8* pRow = (sal_uInt8*) pDstBuf;
-sal_uLong nWidthAl = AlignedWidth4Bytes( rSizePixel.Width() * (
bRLE4 ? 4UL : 8UL ) );
+sal_uLong nWidthAl = AlignedWidth4Bytes( rSizePixel.Width() * (
bRLE4 ? 4UL : 8UL ) );
sal_uInt8* pLast = pDIB + rSizePixel.Height() * nWidthAl - 1;
-sal_uLong nCountByte;
-sal_uLong nRunByte;
-sal_uLong i;
+sal_uLong nCountByte;
+sal_uLong nRunByte;
+sal_uLong i;
BYTEcTmp;
boolbEndDecoding = FALSE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - dtrans/source
dtrans/source/win32/dnd/target.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 022fc2973697d7d25f2b7da3744788fa15a6a477
Author: Michael Stahl
Date: Tue Jul 28 17:20:57 2015 +0200
dtrans: reset DropTarget::m_pDropTarget if it is released
JunitTest_forms_unoapi_3 just crashed in DropTarget::disposing()
with m_pDropTarget pointing to garbage.
Change-Id: Icb5ad15a3d4b857b45553543d404e14abbac4374
(cherry picked from commit 372d416692e0f5a6f1a3a97ff6f967eaab54233c)
Reviewed-on: https://gerrit.libreoffice.org/17388
Reviewed-by: Eike Rathke
Tested-by: Miklos Vajna
diff --git a/dtrans/source/win32/dnd/target.cxx
b/dtrans/source/win32/dnd/target.cxx
index 849b284..9f11329 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.cxx
@@ -87,6 +87,7 @@ void SAL_CALL DropTarget::disposing()
{
CoLockObjectExternal( m_pDropTarget, FALSE, TRUE);
m_pDropTarget->Release();
+m_pDropTarget = nullptr;
}
if( m_oleThreadId)
@@ -171,6 +172,7 @@ void SAL_CALL DropTarget::initialize( const Sequence< Any
>& aArguments )
// do clean up if drag and drop is not possible
CoLockObjectExternal( m_pDropTarget, FALSE, FALSE);
m_pDropTarget->Release();
+m_pDropTarget = nullptr;
m_hWnd= NULL;
}
}
@@ -219,6 +221,7 @@ DWORD WINAPI DndTargetOleSTAFunc(LPVOID pParams)
// do clean up if drag and drop is not possible
CoLockObjectExternal( pTarget->m_pDropTarget, FALSE,
FALSE);
pTarget->m_pDropTarget->Release();
+pTarget->m_pDropTarget = nullptr;
pTarget->m_hWnd= NULL;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: neon and serf
Hi Michael, On 07/28/2015 10:23 PM, Michael Stahl wrote: On 27.07.2015 11:51, Giuseppe Castagno wrote: On 07/27/2015 08:55 AM, Noel Grandin wrote: fixed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=16f3ef520cafaef42694f5e63a60167e3c41081c ... by the way, are we going to continue having both neon and serf WebDAV implementations? iirc the "serf" one only got merged because of Apple's dictatorial app-store censorship regime that rejects anything with a LGPL license for unknown and unexplained reasons? and serf doesn't even solve the one problem with neon, namely that it requires OpenSSL and doesn't work with NSS. or does it? i'd be all for switching to serf if it did :) AFAIK serf uses OpenSSL, I saw nothing regarding NSS. This info comes from the 'scons --help' command issued in serf 1.3.8 main dir. -- Kind Regards, Giuseppe Castagno aka beppec56 Acca Esse http://www.acca-esse.eu giuseppe.castagno at acca-esse.eu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/uiwriter/data/tdf89954.odt|binary
sw/qa/extras/uiwriter/uiwriter.cxx | 22 +
sw/source/core/txtnode/thints.cxx |2 -
writerfilter/source/dmapper/GraphicImport.hxx |4 +--
writerfilter/source/dmapper/StyleSheetTable.cxx|1
writerfilter/source/dmapper/StyleSheetTable.hxx|5 ++--
writerfilter/source/dmapper/TextEffectsHandler.hxx |4 +--
7 files changed, 30 insertions(+), 8 deletions(-)
New commits:
commit e1953f22097d6f895fe27ea21635c37d3cb48f51
Author: Miklos Vajna
Date: Wed Jul 29 09:15:59 2015 +0200
writerfilter: clean up remaining boost::scoped_ptr<> usage
Change-Id: I270c91bec75ff96ac77b550e6adef8d03b07f2b5
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx
b/writerfilter/source/dmapper/GraphicImport.hxx
index 6a10ddb..736a580 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_GRAPHICIMPORT_HXX
#include
-#include
+#include
#include "LoggedResources.hxx"
@@ -64,7 +64,7 @@ enum GraphicImportType
class GraphicImport : public LoggedProperties, public LoggedTable
,public BinaryObj, public LoggedStream
{
-boost::scoped_ptr m_pImpl;
+std::unique_ptr m_pImpl;
css::uno::Reference m_xComponentContext;
css::uno::Reference m_xTextFactory;
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx
b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index 02bd9a9..cce0872 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -21,7 +21,7 @@
#include
-#include
+#include
#include
namespace writerfilter {
@@ -34,7 +34,7 @@ class TextEffectsHandler : public LoggedProperties
private:
boost::optional maPropertyId;
OUString maElementName;
-boost::scoped_ptr mpGrabBagStack;
+std::unique_ptr mpGrabBagStack;
void convertElementIdToPropertyId(sal_Int32 aElementId);
commit 7b1c5b297746e1fbc7d8b728e888478a260c52e4
Author: Miklos Vajna
Date: Wed Jul 29 09:10:44 2015 +0200
writerfilter: use std::unique_ptr<> in StyleSheetTable
Change-Id: I38eebe098c87cceb69b9ff4c48e18d3434ad1557
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 826172b..cdc0e59 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -390,7 +390,6 @@ StyleSheetTable::StyleSheetTable(DomainMapper& rDMapper,
StyleSheetTable::~StyleSheetTable()
{
-delete m_pImpl;
}
PropertyMapPtr StyleSheetTable::GetDefaultCharProps()
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx
b/writerfilter/source/dmapper/StyleSheetTable.hxx
index 44d33ea..ba05630 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -19,6 +19,7 @@
#ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_STYLESHEETTABLE_HXX
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_STYLESHEETTABLE_HXX
+#include
#include "TblStylePrHandler.hxx"
#include
@@ -77,7 +78,7 @@ public:
};
typedef std::shared_ptr StyleSheetEntryPtr;
-typedef ::std::deque StyleSheetEntryDeque;
+typedef std::deque StyleSheetEntryDeque;
typedef std::shared_ptr StyleSheetEntryDequePtr;
class DomainMapper;
@@ -85,7 +86,7 @@ class StyleSheetTable :
public LoggedProperties,
public LoggedTable
{
-StyleSheetTable_Impl *m_pImpl;
+std::unique_ptr m_pImpl;
public:
StyleSheetTable(DomainMapper& rDMapper,
css::uno::Reference const& xTextDocument, bool
bIsNewDoc);
commit 89d615360e80a13fff6bc69885e5780d8fedf149
Author: Miklos Vajna
Date: Wed Jul 29 09:08:00 2015 +0200
tdf#89954 sw: let annotation have CH_TXTATR_INWORD placeholder again
Regression from commit 0761f81643a6890457e9ef7d913ab5c88c2593a4 (123792:
complete annotations on text ranges feature, 2013-12-19), the problem
was that while sw wanted CH_TXTATR_INWORD as a placeholder character for
anchor positions that do not count as a word boundary, the commit
changed GetCharOfTextAttr() so that annotations have CH_TXTATR_BREAKWORD
as the placeholder.
Fix the problem by reverting the last hunk of
sw/source/core/txtnode/thints.cxx changes in that commit.
Change-Id: Ia8c97efda9c1e90ae3c27ddb8247e3f3203a63fb
diff --git a/sw/qa/extras/uiwriter/data/tdf89954.odt
b/sw/qa/extras/uiwriter/data/tdf89954.odt
new file mode 100644
index 000..538d978
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf89954.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index ebac88b..8c06b0d 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.c
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - svx/source
svx/source/svdraw/svdotext.cxx |2 +-
svx/source/unodraw/unoshap2.cxx |1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5e02310180605c7dfc1539eeb0b95d691b1557be
Author: matteocam
Date: Wed Jul 29 09:06:41 2015 +0200
Add chaining constant in unoshap
Change-Id: I4a7d69636df9d5b80420da8fa5bd9bea8cf1d3f0
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index f01fe9e..5ceff5f 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -670,6 +670,7 @@ SvxShapeControlPropertyMapping[] =
{ RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_CHAR_COLOR),
RTL_CONSTASCII_STRINGPARAM("TextColor") },
{ RTL_CONSTASCII_STRINGPARAM("CharBackColor"),
RTL_CONSTASCII_STRINGPARAM("CharBackColor") },
{ RTL_CONSTASCII_STRINGPARAM("CharBackTransparent"),
RTL_CONSTASCII_STRINGPARAM("CharBackTransparent") },
+{ RTL_CONSTASCII_STRINGPARAM(UNO_NAME_TEXT_CHAINNEXTNAME),
RTL_CONSTASCII_STRINGPARAM(UNO_NAME_TEXT_CHAINNEXTNAME) },
{ RTL_CONSTASCII_STRINGPARAM("CharRelief"),
RTL_CONSTASCII_STRINGPARAM("FontRelief") },
{ RTL_CONSTASCII_STRINGPARAM("CharUnderlineColor"),
RTL_CONSTASCII_STRINGPARAM("TextLineColor") },
{ RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_PARA_ADJUST),
RTL_CONSTASCII_STRINGPARAM("Align") },
commit b240c7016c0a305c06918ff8e629226806f3f7ba
Author: matteocam
Date: Wed Jul 29 08:48:54 2015 +0200
Fixed operator
Change-Id: Ib82ad17855654dafc92bdf423691f3e76b54b387
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index de5859e..66b8a7a 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1989,7 +1989,7 @@ bool SdrTextObj::IsChainable() const
// Read it as item
const SfxItemSet& rSet = GetObjectItemSet();
OUString aNextName = static_cast(rSet.Get(SDRATTR_TEXT_CHAINNEXTNAME)).GetValue();
-return aNextName == "";
+return aNextName != "";
// XXX
if (!GetName().startsWith("Chainable")) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
