subject:"\[Libreoffice\-commits\] core.git\: include\/basic"

[Libreoffice-commits] core.git: include/basic

2023-02-19 Thread Andras Timar (via logerrit)

 include/basic/basmgr.hxx |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit a2b8295f428478ba7fd9be2a8dd26c7b948b77f8
Author: Andras Timar 
AuthorDate: Sun Feb 19 09:19:26 2023 +0100
Commit: Andras Timar 
CommitDate: Sun Feb 19 17:43:37 2023 +

Fix error compiler error with VS2019 C2487

e.g. 'GetLibCount': member of dll interface class
may not be declared with dll interface

Change-Id: I4856d0848447ca04747015015af4147b28c2f188
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147278
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 7aec06cb92fd..32710a57bf09 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -135,9 +135,9 @@ public:
 const OUString& GetName() const { return aName; }
 
 
-IF_MERGELIBS(BASIC_DLLPUBLIC) sal_uInt16 GetLibCount() const;
-IF_MERGELIBS(BASIC_DLLPUBLIC) StarBASIC* GetLib( sal_uInt16 nLib ) const;
-IF_MERGELIBS(BASIC_DLLPUBLIC) StarBASIC* GetLib( std::u16string_view rName 
) const;
+sal_uInt16 GetLibCount() const;
+StarBASIC* GetLib( sal_uInt16 nLib ) const;
+StarBASIC* GetLib( std::u16string_view rName ) const;
 sal_uInt16  GetLibId( std::u16string_view rName ) const;
 
 OUStringGetLibName( sal_uInt16 nLib );
@@ -155,7 +155,6 @@ public:
 GetScriptLibraryContainer()  const;
 
 boolLoadLib( sal_uInt16 nLib );
-IF_MERGELIBS(BASIC_DLLPUBLIC)
 boolRemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage );
 
 // Modify-Flag will be reset only during save.
@@ -168,11 +167,9 @@ public:
 If a constant with this name already existed before, its value is 
changed, and the old constant is
 returned in pOldValue. If it does not yet exist, it is newly created, 
and inserted into the basic library.
 */
-IF_MERGELIBS(BASIC_DLLPUBLIC)
 voidSetGlobalUNOConstant( const OUString& rName, const 
css::uno::Any& _rValue, css::uno::Any* pOldValue = nullptr );
 
 /** retrieves a global constant in the basic library, referring to some 
UNO object, returns true if a value is found ( value is in aOut ) false 
otherwise. */
-IF_MERGELIBS(BASIC_DLLPUBLIC)
 boolGetGlobalUNOConstant( const OUString& rName, 
css::uno::Any& aOut );
 /** determines whether there are password-protected modules whose size 
exceeds the
 legacy module size
@@ -182,7 +179,6 @@ public:
 boolLegacyPsswdBinaryLimitExceeded( std::vector< OUString >& 
_out_rModuleNames );
 bool HasExeCode( std::u16string_view );
 /// determines whether the Basic Manager has a given macro, given by fully 
qualified name
-IF_MERGELIBS(BASIC_DLLPUBLIC)
 boolHasMacro( OUString const& i_fullyQualifiedName ) const;
 /// executes a given macro
 ErrCode ExecuteMacro( OUString const& i_fullyQualifiedName, 
SbxArray* i_arguments, SbxValue* i_retValue );

[Libreoffice-commits] core.git: include/basic include/connectivity include/ucbhelper include/vcl

2023-02-16 Thread Andras Timar (via logerrit)

 include/basic/basmgr.hxx   |2 +-
 include/connectivity/paramwrapper.hxx  |2 +-
 include/connectivity/sdbcx/VCollection.hxx |2 +-
 include/ucbhelper/interactionrequest.hxx   |6 +++---
 include/vcl/IDialogRenderable.hxx  |2 +-
 include/vcl/metaact.hxx|8 
 6 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit cc584681cae755c6de07f343093259bbe034392a
Author: Andras Timar 
AuthorDate: Tue Jul 20 11:54:05 2021 +0200
Commit: Andras Timar 
CommitDate: Thu Feb 16 09:49:56 2023 +

set visibility of classes in mergelib+asan case

Change-Id: I2eb80d0b3002f174deea0d8657cb0cdbdec5be8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147144
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 1d0fc37c0a85..7aec06cb92fd 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -94,7 +94,7 @@ struct LibraryContainerInfo
 
 #define LIB_NOTFOUND0x
 
-class UNLESS_MERGELIBS(BASIC_DLLPUBLIC) BasicManager final : public 
SfxBroadcaster
+class BASIC_DLLPUBLIC BasicManager final : public SfxBroadcaster
 {
 friend class LibraryContainer_Impl;
 friend class StarBasicAccess_Impl;
diff --git a/include/connectivity/paramwrapper.hxx 
b/include/connectivity/paramwrapper.hxx
index bf16e0851fcb..b862a619af85 100644
--- a/include/connectivity/paramwrapper.hxx
+++ b/include/connectivity/paramwrapper.hxx
@@ -49,7 +49,7 @@ namespace dbtools::param
 /** wraps a parameter column as got from an SQLQueryComposer, so that it 
has an additional
 property "Value", which is forwarded to an XParameters interface
 */
-class UNLESS_MERGELIBS(OOO_DLLPUBLIC_DBTOOLS) ParameterWrapper final : 
public ::cppu::OWeakObject
+class OOO_DLLPUBLIC_DBTOOLS ParameterWrapper final : public 
::cppu::OWeakObject
 ,public css::lang::XTypeProvider
 ,public ::comphelper::OMutexAndBroadcastHelper
 ,public ::cppu::OPropertySetHelper
diff --git a/include/connectivity/sdbcx/VCollection.hxx 
b/include/connectivity/sdbcx/VCollection.hxx
index 0f5a0b3fbcb9..997df0dd2242 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -58,7 +58,7 @@ namespace connectivity::sdbcx
 
 typedef css::uno::Reference< css::beans::XPropertySet > ObjectType;
 
-class UNLESS_MERGELIBS(OOO_DLLPUBLIC_DBTOOLS) SAL_NO_VTABLE 
IObjectCollection
+class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE IObjectCollection
 {
 public:
 virtual ~IObjectCollection();
diff --git a/include/ucbhelper/interactionrequest.hxx 
b/include/ucbhelper/interactionrequest.hxx
index 78fc31f7a23b..16e9eda38b96 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -222,7 +222,7 @@ public:
   * along with an interaction request to indicate the possibility to approve
   * the request.
   */
-class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) InteractionApprove final : public 
InteractionContinuation,
+class UCBHELPER_DLLPUBLIC InteractionApprove final : public 
InteractionContinuation,
public css::lang::XTypeProvider,
public css::task::XInteractionApprove
 {
@@ -255,7 +255,7 @@ public:
   * along with an interaction request to indicate the possibility to disapprove
   * the request.
   */
-class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) InteractionDisapprove final : 
public InteractionContinuation,
+class UCBHELPER_DLLPUBLIC InteractionDisapprove final : public 
InteractionContinuation,
   public css::lang::XTypeProvider,
   public css::task::XInteractionDisapprove
 {
@@ -288,7 +288,7 @@ public:
   * passed along with an authentication interaction request to enable the
   * interaction handler to supply the missing authentication data.
   */
-class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) InteractionSupplyAuthentication 
final :
+class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication final :
   public InteractionContinuation,
   public css::lang::XTypeProvider,
   public css::ucb::XInteractionSupplyAuthentication2
diff --git a/include/vcl/IDialogRenderable.hxx 
b/include/vcl/IDialogRenderable.hxx
index 68a573574186..bb5480f1bf4f 100644
--- a/include/vcl/IDialogRenderable.hxx
+++ b/include/vcl/IDialogRenderable.hxx
@@ -27,7 +27,7 @@ typedef std::pair 
LOKPayloadItem;
 
 typedef sal_uInt32 LOKWindowId;
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) ILibreOfficeKitNotifier
+class VCL_DLLPUBLIC ILibreOfficeKitNotifier
 {
 public:
 virtual ~ILibreOfficeKitNotifier();
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index c820d93b560c..06357c74a7eb 100644
--- a/include/vcl/metaact.hxx
+++

[Libreoffice-commits] core.git: include/basic

2023-02-13 Thread buldi (via logerrit)

 include/basic/sbx.hxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 4e822d22e11e241113e392a1475a479e052df909
Author: buldi 
AuthorDate: Sat Feb 11 03:55:46 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Feb 13 13:18:18 2023 +

tdf#143148 Use pragma once instead of include guard

Change-Id: I6fa77335ced02442eec69b0dbb088505eb4b1aa0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146818
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 7997f53ef422..53f9d1b0760d 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASIC_SBX_HXX
-#define INCLUDED_BASIC_SBX_HXX
+#pragma once
 
 #include 
 #include 
@@ -208,6 +207,4 @@ typedef tools::SvRef SbxArrayRef;
 typedef tools::SvRef SbxInfoRef;
 typedef tools::SvRef SbxDimArrayRef;
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

[Libreoffice-commits] core.git: include/basic

2022-08-22 Thread Caolán McNamara (via logerrit)

 include/basic/sbxvar.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f7b34a779eb49498ecce60b873538c53ec5bc278
Author: Caolán McNamara 
AuthorDate: Mon Aug 22 10:00:31 2022 +0100
Commit: Caolán McNamara 
CommitDate: Mon Aug 22 15:04:59 2022 +0200

cid#1500544 Uninitialized scalar variable

Change-Id: Ibe55cef41b6e6fd2ea10a9f4684e5f3e7926983a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138672
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 0c5f84b60752..2641df72ca26 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -77,7 +77,7 @@ struct SbxValues
 SbxDataType  eType;
 
 SbxValues(): pData( nullptr ), eType(SbxEMPTY) {}
-SbxValues( SbxDataType e ): eType(e) {}
+SbxValues( SbxDataType e ): pData( nullptr ), eType(e) {}
 SbxValues( double _nDouble ): nDouble( _nDouble ), eType(SbxDOUBLE) {}
 
 void clear(SbxDataType type) {

[Libreoffice-commits] core.git: include/basic include/rtl include/svx

2022-04-05 Thread Andrea Gelmini (via logerrit)

 include/basic/sbxvar.hxx  |2 +-
 include/rtl/stringutils.hxx   |2 +-
 include/svx/diagram/datamodel.hxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cbb66e9ace2151d4386ce100aabc3a2b0c9d483e
Author: Andrea Gelmini 
AuthorDate: Tue Apr 5 21:44:12 2022 +0200
Commit: Julien Nabet 
CommitDate: Tue Apr 5 21:49:04 2022 +0200

Fix typos

Change-Id: Iaf248ec769b82bdb22ac0620a1dc31ea90823d4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132535
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 01f5b650ebe0..0c5f84b60752 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -248,7 +248,7 @@ class BASIC_DLLPUBLIC SbxVariable : public SbxValue
 StarBASIC*   m_pComListenerParentBasic = nullptr;
 std::unique_ptr  mpBroadcaster; // Broadcaster, if needed
 OUString maName;// Name, if available
-mutable OUString maNameCI;  // Name, case insentitive - cached for 
fast comparison
+mutable OUString maNameCI;  // Name, case insensitive - cached for 
fast comparison
 SbxArrayRef  mpPar; // Parameter-Array, if set
 sal_uInt16   nHash = 0; // Hash-ID for search
 
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx
index be56408c52a8..58781973fab9 100644
--- a/include/rtl/stringutils.hxx
+++ b/include/rtl/stringutils.hxx
@@ -119,7 +119,7 @@ There are 2 cases:
 with known size of the content). In this case ConstCharArrayDetector is 
used to ensure the function
 is called only with const char[N] arguments. There's no other plain C 
string type overload.
 (Note that OUStringChar is also covered by ConstCharArrayDetector's 
TypeUtf16 check, but
-provides a pointer to a string that is not NUL-termianted, unlike the 
char16_t const[N] arrays
+provides a pointer to a string that is not NUL-terminated, unlike the 
char16_t const[N] arrays
 normally covered by that check, and which are assumed to represent 
NUL-terminated string
 literals.)
 2) All plain C string types are wanted, and const char[N] needs to be handled 
differently.
diff --git a/include/svx/diagram/datamodel.hxx 
b/include/svx/diagram/datamodel.hxx
index a07962497b13..1ad52b060d9e 100644
--- a/include/svx/diagram/datamodel.hxx
+++ b/include/svx/diagram/datamodel.hxx
@@ -158,7 +158,7 @@ public:
 typedef std::map< OUString, std::map > 
StringMap;
 
 protected:
-// Make constructor protected to signal that this anyways pure virual class
+// Make constructor protected to signal that this anyways pure virtual 
class
 // shall not be incarnated - target to use is oox::drawingml::DiagramData
 DiagramData();

[Libreoffice-commits] core.git: include/basic

2022-03-18 Thread Stephan Bergmann (via logerrit)

 include/basic/sbxvar.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7dd087002816cdde9a5049a36840446765061fb8
Author: Stephan Bergmann 
AuthorDate: Fri Mar 18 08:43:49 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Mar 18 10:30:56 2022 +0100

Improve a mis-translated comment

...which was the German

  // Falls wir ein Schweinezeichen haben, abbrechen!!

until 3d361dbc2d69484657c42852dcfa426c00bc3175 "Translation of Comments to
English"

Change-Id: I655514ec38596d16b15d22a02f38d0cf60b80302
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131726
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 6454e445629f..1f1ac8a8c4fc 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -308,7 +308,7 @@ public:
 const auto first6 = aName.substr(0, 6);
 for (const auto& c : first6)
 {
-// If we have a comment sign break!!
+// If we have a filthy non-ASCII character, break!!
 if (c >= 0x80)
 return 0;
 n = static_cast((n << 3) + rtl::toAsciiUpperCase(c));

[Libreoffice-commits] core.git: include/basic

2021-11-30 Thread Luboš Luňák (via logerrit)

 include/basic/modsizeexceeded.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a49cd1cebde3853aca839dc6dc0df7845585480f
Author: Luboš Luňák 
AuthorDate: Tue Nov 30 18:34:09 2021 +0100
Commit: Luboš Luňák 
CommitDate: Tue Nov 30 21:43:00 2021 +0100

fix clang-cl build with -Zc:dllexportInlines-

This hack causes undefined references to those dllimport symbols,
and it doesn't seem to be necessary for clang-cl (I've checked
both normal and mergelibs build with -Zc:dllexportInlines-).

Change-Id: Iaa33698950732b59cec2e6c5078f91a42980
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126149
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/include/basic/modsizeexceeded.hxx 
b/include/basic/modsizeexceeded.hxx
index 7403b398e777..8910be30b767 100644
--- a/include/basic/modsizeexceeded.hxx
+++ b/include/basic/modsizeexceeded.hxx
@@ -28,7 +28,7 @@
 
 namespace com::sun::star::task { class XInteractionContinuation; }
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(__clang__)
 // MSVC automatically applies dllexport to template instantiations if they are 
a base class
 // of a dllexport class, and this template instantiation is a case of that. If 
we don't
 // dllimport here, MSVC will complain about duplicate symbols in a mergelibs 
build.

[Libreoffice-commits] core.git: include/basic

2021-10-11 Thread Luboš Luňák (via logerrit)

 include/basic/modsizeexceeded.hxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit bbe9bfee56ce395c5fa1c1173e9909925a3a6393
Author: Luboš Luňák 
AuthorDate: Mon Oct 11 08:41:12 2021 +0200
Commit: Luboš Luňák 
CommitDate: Mon Oct 11 11:31:05 2021 +0200

fix MSVC mergelibs build

Linker complains about duplicate symbols for the template, seems
to be a case of
https://codesynthesis.com/~boris/blog/2010/01/18/dll-export-cxx-templates/

Change-Id: Iaffa3ba55edf4e54c62757c64d6b340b55a514cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123362
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/include/basic/modsizeexceeded.hxx 
b/include/basic/modsizeexceeded.hxx
index decaae9b07b3..7403b398e777 100644
--- a/include/basic/modsizeexceeded.hxx
+++ b/include/basic/modsizeexceeded.hxx
@@ -28,6 +28,13 @@
 
 namespace com::sun::star::task { class XInteractionContinuation; }
 
+#if defined(_MSC_VER)
+// MSVC automatically applies dllexport to template instantiations if they are 
a base class
+// of a dllexport class, and this template instantiation is a case of that. If 
we don't
+// dllimport here, MSVC will complain about duplicate symbols in a mergelibs 
build.
+template class __declspec(dllimport) cppu::WeakImplHelper< 
css::task::XInteractionRequest >;
+#endif
+
 class UNLESS_MERGELIBS(BASIC_DLLPUBLIC) ModuleSizeExceeded final : public 
cppu::WeakImplHelper< css::task::XInteractionRequest >
 {
 // C++ interface

[Libreoffice-commits] core.git: include/basic include/editeng include/store include/svtools include/vcl reportdesign/source sal/rtl store/source sw/source

2020-01-25 Thread Stephan Bergmann (via logerrit)

 include/basic/sbxdef.hxx  |   58 +++---
 include/editeng/adjustitem.hxx|2 
 include/editeng/boxitem.hxx   |4 
 include/editeng/brushitem.hxx |2 
 include/editeng/fhgtitem.hxx  |4 
 include/editeng/formatbreakitem.hxx   |2 
 include/store/types.h |   14 -
 include/svtools/ruler.hxx |   32 +--
 include/vcl/keycodes.hxx  |  256 +++---
 include/vcl/menu.hxx  |6 
 include/vcl/toolbox.hxx   |4 
 reportdesign/source/ui/inc/CondFormat.hxx |2 
 sal/rtl/alloc_arena.hxx   |   14 -
 store/source/storbios.cxx |2 
 sw/source/uibase/docvw/edtwin.cxx |2 
 15 files changed, 202 insertions(+), 202 deletions(-)

New commits:
commit 572681bfc7bb141c9f16694df05a505e9d9f1a88
Author: Stephan Bergmann 
AuthorDate: Sat Jan 25 12:11:26 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Sat Jan 25 13:04:17 2020 +0100

Change some #define to constexpr

...plus loplugin:unnecessaryparen fallout in 
sw/source/uibase/docvw/edtwin.cxx.

Each of the files contained at least one #define that would have caused 
warnings
with upcoming loplugin:unsignedcompare.  For consistency, I changed all 
#defines
in those files (using a variable of a specific type if the original #define 
used
a cast to that type, otherwise using 'auto').

Change-Id: I66f71b2d83394c9dc6952ae19df774cdd4d0b76a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87374
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index 93cad7008f6f..2acbac0c98be 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -156,55 +156,55 @@ namespace o3tl
 
 // List of all creators for Load/Store
 
-#define SBXCR_SBX0x20584253// SBX(blank)
+constexpr auto SBXCR_SBX = 0x20584253;// SBX(blank)
 
 // List of predefined SBX-IDs. New SBX-IDs must be precisely defined so that
 // they are unique within the Stream and appropriate Factory.
 
-#define SBXID_VALUE 0x4E4E  // NN: SbxValue
-#define SBXID_VARIABLE  0x4156  // VA: SbxVariable
-#define SBXID_ARRAY 0x5241  // AR: SbxArray
-#define SBXID_DIMARRAY  0x4944  // DI: SbxDimArray
-#define SBXID_OBJECT0x424F  // OB: SbxObject
-#define SBXID_COLLECTION0x4F43  // CO: SbxCollection
-#define SBXID_FIXCOLLECTION 0x4346  // FC: SbxStdCollection
-#define SBXID_METHOD0x454D  // ME: SbxMethod
-#define SBXID_PROPERTY  0x5250  // PR: SbxProperty
+constexpr auto SBXID_VALUE = 0x4E4E;  // NN: SbxValue
+constexpr auto SBXID_VARIABLE = 0x4156;  // VA: SbxVariable
+constexpr auto SBXID_ARRAY = 0x5241;  // AR: SbxArray
+constexpr auto SBXID_DIMARRAY = 0x4944;  // DI: SbxDimArray
+constexpr auto SBXID_OBJECT = 0x424F;  // OB: SbxObject
+constexpr auto SBXID_COLLECTION = 0x4F43;  // CO: SbxCollection
+constexpr auto SBXID_FIXCOLLECTION = 0x4346;  // FC: SbxStdCollection
+constexpr auto SBXID_METHOD = 0x454D;  // ME: SbxMethod
+constexpr auto SBXID_PROPERTY = 0x5250;  // PR: SbxProperty
 
 // StarBASIC restricts the base data type to different intervals.
 // These intervals are fixed to create 'portability and independent
 // of the implementation. Only type double is greedy and takes
 // what it gets.
 
-#define SbxMAXCHAR  (u'\x')
-#define SbxMINCHAR  (0)
-#define SbxMAXBYTE  ( 255)
-#define SbxMAXINT   ( 32767)
-#define SbxMININT   (-32768)
-#define SbxMAXUINT  (sal_uInt16(65535))
-#define SbxMAXLNG   ( 2147483647)
-#define SbxMINLNG   (sal_Int32(-2147483647-1))
-#define SbxMAXULNG  (sal_uInt32(0x))
+constexpr auto SbxMAXCHAR = u'\x';
+constexpr auto SbxMINCHAR = 0;
+constexpr auto SbxMAXBYTE = 255;
+constexpr auto SbxMAXINT = 32767;
+constexpr auto SbxMININT = -32768;
+constexpr sal_uInt16 SbxMAXUINT = 65535;
+constexpr auto SbxMAXLNG = 2147483647;
+constexpr sal_Int32 SbxMINLNG = -2147483647-1;
+constexpr sal_uInt32 SbxMAXULNG = 0x;
 
 // Currency stored as SbxSALINT64 == sal_Int64
 // value range limits are ~(2^63 - 1)/1
 // fixed precision has 4 digits right of decimal pt
-#define CURRENCY_FACTOR (1)
-#define CURRENCY_FACTOR_SQUARE  (1)
+constexpr auto CURRENCY_FACTOR = 1;
+constexpr auto CURRENCY_FACTOR_SQUARE = 1;
 
 // TODO effective MAX/MINCURR limits:
 // true value ( 922337203685477.5807) is too precise for correct comparison to 
64bit double
-#define SbxMAXCURR  ( 922337203685477.5807)
-#define SbxMINCURR  (-922337203685477.5808)
+constexpr auto SbxMAXCURR = 922337203685477.5807;
+constexpr auto SbxMINCURR = -922337203685477.5808;
 
-#define SbxMAXSNG   ( 3.402823e+38)
-#define SbxMINSNG   (-3.402823e+38)
-#define SbxMAXSNG2  ( 1.175494351e-38)
-#define SbxMINSNG2

[Libreoffice-commits] core.git: include/basic sc/source

2018-07-27 Thread Libreoffice Gerrit user

 include/basic/sbstar.hxx |3 ++-
 sc/source/core/tool/interpr4.cxx |5 +
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 76bf3939b0583212a56c317c85aea110f8ac6fee
Author: Markus Mohrhard 
AuthorDate: Thu Jul 26 00:17:41 2018 +0200
Commit: Markus Mohrhard 
CommitDate: Fri Jul 27 08:01:03 2018 +0200

related tdf#109132, ugly hack to ensure the VBA mode is setup during import

Change-Id: Ia48e4b19eb690ba7ab24a37538f6de11a74ad4d3
Reviewed-on: https://gerrit.libreoffice.org/58148
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index 86b0d8e7a0c6..884974597388 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -62,7 +62,6 @@ class BASIC_DLLPUBLIC StarBASIC : public SbxObject
 boolbQuit;
 
 SbxObjectRef pVBAGlobals;
-BASIC_DLLPRIVATE SbxObject* getVBAGlobals( );
 
 BASIC_DLLPRIVATE void implClearDependingVarsOnDelete( StarBASIC* 
pDeletedBasic );
 
@@ -155,6 +154,8 @@ public:
 void QuitAndExitApplication();
 bool IsQuitApplication() { return bQuit; };
 
+SbxObject* getVBAGlobals( );
+
 static css::uno::Reference< css::frame::XModel >
 GetModelFromBasic( SbxObject* pBasic );
 
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 4d836828eeba..fe02c2fe765d 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3215,6 +3215,11 @@ void ScInterpreter::ScMacro()
 OSL_ENSURE(dynamic_cast(pObject) != nullptr, "No Basic 
found!");
 OUString aMacroStr = pObject->GetName() + "." + pModule->GetName() + "." + 
pMethod->GetName();
 OUString aBasicStr;
+if (pRoot && bUseVBAObjects)
+{
+// just here to make sure the VBA objects when we run the macro during 
ODF import
+pRoot->getVBAGlobals();
+}
 if (pObject->GetParent())
 {
 aBasicStr = pObject->GetParent()->GetName();// document BASIC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/basic include/editeng include/svtools include/svx include/vcl sc/inc sc/source sd/inc sd/source sfx2/source svtools/source svx/source sw/inc sw/source uui/inc u

2017-08-22 Thread Noel Grandin

 include/basic/sberrors.hxx |  220 ++---
 include/basic/sbxdef.hxx   |   60 +-
 include/editeng/editdata.hxx   |2 
 include/editeng/editerr.hxx|5 
 include/svtools/ehdl.hxx   |6 -
 include/svtools/sfxecode.hxx   |   41 +++---
 include/svtools/soerr.hxx  |4 
 include/svx/svxerr.hxx |   55 ++---
 include/vcl/errcode.hxx|  157 --
 include/vcl/graphicfilter.hxx  |   14 +-
 sc/inc/scerrors.hxx|   73 ++--
 sc/inc/scwarngs.hxx|4 
 sc/source/ui/app/scmod.cxx |4 
 sd/inc/sderror.hxx |6 -
 sd/source/ui/app/sdmod.cxx |2 
 sfx2/source/appl/appinit.cxx   |6 -
 svtools/source/misc/ehdl.cxx   |4 
 svx/source/items/svxerr.cxx|2 
 sw/inc/error.hrc   |4 
 sw/inc/swerror.h   |   40 +++---
 sw/source/filter/ascii/parasc.cxx  |2 
 sw/source/uibase/app/swmodule.cxx  |4 
 uui/inc/ids.hxx|  128 ++---
 uui/source/iahndl-errorhandler.cxx |   11 -
 24 files changed, 408 insertions(+), 446 deletions(-)

New commits:
commit 158595543053c158a9bcb95f679e7b8a3c2e4e89
Author: Noel Grandin 
Date:   Sat Aug 19 18:31:00 2017 +0200

Convert ErrCode area to scoped enum

Change-Id: Ifa365bbac3c7eb21da9381ec8bb3be6b6785016b
Reviewed-on: https://gerrit.libreoffice.org/41402
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/basic/sberrors.hxx b/include/basic/sberrors.hxx
index d63012a1381a..d35a5ceb6a39 100644
--- a/include/basic/sberrors.hxx
+++ b/include/basic/sberrors.hxx
@@ -53,228 +53,228 @@
 #define ERRCODE_BASIC_WRONG_ARGSERRCODE_SBX_WRONG_ARGS 
 // Wrong number of arguments
 #define ERRCODE_BASIC_NOT_A_COLLERRCODE_SBX_NOT_A_COLL 
 // Object not a collection
 
-// Append Basic specific error messages to ERRCODE_AREA_SBX
-#define ERRCODE_BASIC_NO_GOSUB  ErrCode((LAST_SBX_ERROR_ID+1) | 
ERRCODE_AREA_SBX | \
+// Append Basic specific error messages to ErrCodeArea::Sbx
+#define ERRCODE_BASIC_NO_GOSUB  ErrCode( ErrCodeArea::Sbx, 
(LAST_SBX_ERROR_ID+1) | \
 ERRCODE_CLASS_RUNTIME) 
 // Return without Gosub
-#define ERRCODE_BASIC_REDO_FROM_START   ErrCode((LAST_SBX_ERROR_ID+2) | 
ERRCODE_AREA_SBX | \
+#define ERRCODE_BASIC_REDO_FROM_START   ErrCode( ErrCodeArea::Sbx, 
(LAST_SBX_ERROR_ID+2) | \
 ERRCODE_CLASS_RUNTIME) 
 // Redo form start (SB internal)
-#define ERRCODE_BASIC_NO_MEMORY ErrCode((LAST_SBX_ERROR_ID+3) | 
ERRCODE_AREA_SBX | \
+#define ERRCODE_BASIC_NO_MEMORY ErrCode( ErrCodeArea::Sbx, 
(LAST_SBX_ERROR_ID+3) | \
 ERRCODE_CLASS_RUNTIME) 
 // Out of memory
-#define ERRCODE_BASIC_ALREADY_DIM   ErrCode((LAST_SBX_ERROR_ID+4) | 
ERRCODE_AREA_SBX | \
+#define ERRCODE_BASIC_ALREADY_DIM   ErrCode( ErrCodeArea::Sbx, 
(LAST_SBX_ERROR_ID+4) | \
 ERRCODE_CLASS_RUNTIME) 
 // Array already dimensioned
-#define ERRCODE_BASIC_DUPLICATE_DEF ErrCode((LAST_SBX_ERROR_ID+5) | 
ERRCODE_AREA_SBX | \
+#define ERRCODE_BASIC_DUPLICATE_DEF ErrCode( ErrCodeArea::Sbx, 
(LAST_SBX_ERROR_ID+5) | \
 ERRCODE_CLASS_RUNTIME) 
 // Duplicate definition
-#define ERRCODE_BASIC_VAR_UNDEFINED ErrCode((LAST_SBX_ERROR_ID+6) | 
ERRCODE_AREA_SBX | \
+#define ERRCODE_BASIC_VAR_UNDEFINED ErrCode( ErrCodeArea::Sbx, 
(LAST_SBX_ERROR_ID+6) | \
 ERRCODE_CLASS_RUNTIME)  // 
Variable undefined (SB)
-#define ERRCODE_BASIC_USER_ABORTErrCode((LAST_SBX_ERROR_ID+7) | 
ERRCODE_AREA_SBX | \
+#define ERRCODE_BASIC_USER_ABORTErrCode( ErrCodeArea::Sbx, 
(LAST_SBX_ERROR_ID+7) | \
 ERRCODE_CLASS_RUNTIME) 
 // User interrupt occurred
-#define ERRCODE_BASIC_BAD_RESUMEErrCode((LAST_SBX_ERROR_ID+8) | 
ERRCODE_AREA_SBX | \
+#define ERRCODE_BASIC_BAD_RESUMEErrCode( ErrCodeArea::Sbx, 
(LAST_SBX_ERROR_ID+8) | \
 ERRCODE_CLASS_RUNTIME) 
 // Resume without error
-#define ERRCODE_BASIC_STACK_OVERFLOWErrCode((LAST_SBX_ERROR_ID+9) | 
ERRCODE_AREA_SBX | \
+#define ERRCODE_BASIC_STACK_OVERFLOWErrCode( ErrCodeArea::Sbx, 
(LAST_SBX_ERROR_ID+9) | \
 ERRCODE_CLASS_RUNTIME) 
 // Out of stack space
-#define ERRCODE_BASIC_BAD_DLL_LOAD

[Libreoffice-commits] core.git: include/basic

2017-06-01 Thread Caolán McNamara

 include/basic/sberrors.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 52fc13a6f701b1e94ffc012e1cfe07a25747ccc6
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 1 14:31:01 2017 +0100

SbError is a ErrCode

Change-Id: I2b4f0680f4adedc5661c6a9d2556ac3ecf2c4659
Reviewed-on: https://gerrit.libreoffice.org/38311
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/include/basic/sberrors.hxx b/include/basic/sberrors.hxx
index 6ec016fd1ce5..f1e44a977754 100644
--- a/include/basic/sberrors.hxx
+++ b/include/basic/sberrors.hxx
@@ -23,7 +23,7 @@
 #include 
 
 #ifndef __RSC
-typedef sal_uIntPtr SbError;
+typedef ErrCode SbError;
 #endif
 
 // Mapping to SbxError
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/basic

2016-09-22 Thread Noel Grandin

 include/basic/sbxvar.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e0e8d0fbcf018ac172865af5a3070f30b06d1df5
Author: Noel Grandin 
Date:   Thu Sep 22 21:55:58 2016 +0200

fix windows build

by reverting part of commit
commit 7419057e3ec4365748fa6456e207f40fd9e09c62
Author: Noel Grandin 
Date:   Thu Sep 22 16:34:14 2016 +0200
loplugin:unusedmethods in chart2..svx

Change-Id: I72515c9b5f3739f57d4b63a724a9fa32075b2612
Reviewed-on: https://gerrit.libreoffice.org/29197
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 0ad7169..60ab190 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -119,6 +119,8 @@ public:
 const SbxValues& GetValues_Impl() const { return aData; }
 bool Put( const SbxValues& );
 
+SbxValues * data() { return  }
+
 sal_Unicode GetChar() const;
 sal_Int16   GetInteger() const;
 sal_Int32   GetLong() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/basic

2016-09-15 Thread Stephan Bergmann

 include/basic/sbmod.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f1d9f6c8fa6cf801d1e92faeae711382ccf9fdde
Author: Stephan Bergmann 
Date:   Thu Sep 15 11:51:35 2016 +0200

Remove unused declaration

Change-Id: Ica1bb8ed197f4581da4a4df61b91a91081602b91

diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index 3ac306a..b4d539f 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -36,7 +36,6 @@ class SbProperty;
 class SbiRuntime;
 typedef std::deque< sal_uInt16 > SbiBreakpoints;
 class SbiImage;
-class SbProcedureProperty;
 class SbIfaceMapperMethod;
 class SbClassModuleObject;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/basic

2016-06-14 Thread Caolán McNamara

 include/basic/sbx.hxx|8 
 include/basic/sbxvar.hxx |6 --
 2 files changed, 14 deletions(-)

New commits:
commit e8a9eba781368101faa37b3803ee4ffb4c050112
Author: CaolÃ¡n McNamara 
Date:   Tue Jun 14 10:32:06 2016 +0100

drop these typedef header guard

Change-Id: If52f2bba475e7a8a5b7c63d5114f2725c9ce8617

diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 91351ac..a75a8d4 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -252,16 +252,8 @@ public:
 virtual void Insert( SbxVariable* ) override;
 };
 
-#ifndef SBX_ARRAY_DECL_DEFINED
-#define SBX_ARRAY_DECL_DEFINED
 typedef tools::SvRef SbxArrayRef;
-#endif
-
-#ifndef SBX_INFO_DECL_DEFINED
-#define SBX_INFO_DECL_DEFINED
 typedef tools::SvRef SbxInfoRef;
-#endif
-
 typedef tools::SvRef SbxDimArrayRef;
 
 #endif
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 0f66fcf..3ee3768 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -209,15 +209,9 @@ inline SbxValue& SbxValue::operator-=( const SbxValue& r )
 class SbxArray;
 class SbxInfo;
 
-#ifndef SBX_ARRAY_DECL_DEFINED
-#define SBX_ARRAY_DECL_DEFINED
 typedef tools::SvRef SbxArrayRef;
-#endif
 
-#ifndef SBX_INFO_DECL_DEFINED
-#define SBX_INFO_DECL_DEFINED
 typedef tools::SvRef SbxInfoRef;
-#endif
 
 class SfxBroadcaster;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/basic

2015-10-20 Thread Noel Grandin

 include/basic/basicmanagerrepository.hxx |4 ++--
 include/basic/basmgr.hxx |   25 -
 include/basic/modsizeexceeded.hxx|   28 ++--
 include/basic/sbmod.hxx  |6 +++---
 include/basic/sbstar.hxx |6 +++---
 include/basic/sbuno.hxx  |8 
 include/basic/sbxvar.hxx |6 +++---
 include/basic/vbahelper.hxx  |6 +++---
 8 files changed, 44 insertions(+), 45 deletions(-)

New commits:
commit baffe9bd291da266ea731afd8c801696d8575e17
Author: Noel Grandin 
Date:   Mon Oct 19 11:53:41 2015 +0200

convert com::sun::star->css in include/basic

Change-Id: I40d092d1ae1391ce99d01a7e0c6cd0432a2696ca
Reviewed-on: https://gerrit.libreoffice.org/19457
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/basic/basicmanagerrepository.hxx 
b/include/basic/basicmanagerrepository.hxx
index 5c03991..60c9afe 100644
--- a/include/basic/basicmanagerrepository.hxx
+++ b/include/basic/basicmanagerrepository.hxx
@@ -51,7 +51,7 @@ namespace basic
 decide to add global variables to it, or otherwise initialize 
it.
 */
 virtual void onBasicManagerCreated(
-const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XModel >& _rxForDocument,
+const css::uno::Reference< css::frame::XModel >& _rxForDocument,
 BasicManager& _rBasicManager
 ) = 0;
 
@@ -92,7 +92,7 @@ namespace basic
 as it's closed, the associated BasicManager is deleted.
 */
 static BasicManager* getDocumentBasicManager(
-const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XModel >& _rxDocumentModel
+const css::uno::Reference< css::frame::XModel >& _rxDocumentModel
 );
 
 /** returns the application-wide BasicManager
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 97a7e99..c8bbb2d 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -27,7 +27,7 @@
 #include 
 
 // Basic XML Import/Export
-BASIC_DLLPUBLIC com::sun::star::uno::Reference< 
com::sun::star::script::XStarBasicAccess >
+BASIC_DLLPUBLIC css::uno::Reference< css::script::XStarBasicAccess >
 getStarBasicAccess( BasicManager* pMgr );
 
 class SotStorage;
@@ -76,8 +76,8 @@ protected:
 
 struct LibraryContainerInfo
 {
-::com::sun::star::uno::Reference< 
com::sun::star::script::XPersistentLibraryContainer > mxScriptCont;
-::com::sun::star::uno::Reference< 
com::sun::star::script::XPersistentLibraryContainer > mxDialogCont;
+css::uno::Reference< css::script::XPersistentLibraryContainer > 
mxScriptCont;
+css::uno::Reference< css::script::XPersistentLibraryContainer > 
mxDialogCont;
 OldBasicPassword* mpOldBasicPassword;
 
 LibraryContainerInfo()
@@ -87,8 +87,8 @@ struct LibraryContainerInfo
 
 LibraryContainerInfo
 (
-com::sun::star::uno::Reference< 
com::sun::star::script::XPersistentLibraryContainer > xScriptCont,
-com::sun::star::uno::Reference< 
com::sun::star::script::XPersistentLibraryContainer > xDialogCont,
+css::uno::Reference< css::script::XPersistentLibraryContainer > 
xScriptCont,
+css::uno::Reference< css::script::XPersistentLibraryContainer > 
xDialogCont,
 OldBasicPassword* pOldBasicPassword
 )
 : mxScriptCont( xScriptCont )
@@ -167,9 +167,9 @@ public:
 */
 voidSetLibraryContainerInfo( const LibraryContainerInfo& rInfo 
);
 
-const ::com::sun::star::uno::Reference< 
com::sun::star::script::XPersistentLibraryContainer >&
+const css::uno::Reference< css::script::XPersistentLibraryContainer >&
 GetDialogLibraryContainer()  const;
-const ::com::sun::star::uno::Reference< 
com::sun::star::script::XPersistentLibraryContainer >&
+const css::uno::Reference< css::script::XPersistentLibraryContainer >&
 GetScriptLibraryContainer()  const;
 
 boolLoadLib( sal_uInt16 nLib );
@@ -185,17 +185,17 @@ public:
 If a constant with this name already existed before, its value is 
changed, and the old constant is
 returned. If it does not yet exist, it is newly created, and inserted 
into the basic library.
 */
-::com::sun::star::uno::Any
-SetGlobalUNOConstant( const sal_Char* _pAsciiName, const 
::com::sun::star::uno::Any& _rValue );
+css::uno::Any
+SetGlobalUNOConstant( const sal_Char* _pAsciiName, const 
css::uno::Any& _rValue );
 
 /** retrieves a global constant in the basic library, referring to some 
UNO object, returns true if a value is found ( value is in aOut ) false 
otherwise. */
-bool GetGlobalUNOConstant( const sal_Char* _pAsciiName, 
::com::sun::star::uno::Any& aOut

[Libreoffice-commits] core.git: include/basic

2015-07-17 Thread Michael Stahl

 include/basic/sbx.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8f9effacd8f7817a0ad2b1d89b96682855583e48
Author: Michael Stahl mst...@redhat.com
Date:   Fri Jul 17 20:45:31 2015 +0200

basic: try to prevent MSVC from generating copy assignment

Change-Id: I7232f69a465b1acaf069005b3695039bdc96c7a3

diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 66c2d09..a4e9723 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -71,6 +71,9 @@ class BASIC_DLLPUBLIC SbxInfo : public SvRefBase
 sal_uInt32  nHelpId;
 SbxParams   m_Params;
 
+SbxInfo(SbxInfo const) = delete;
+void operator=(SbxInfo const) = delete;
+
 protected:
 bool LoadData( SvStream, sal_uInt16 );
 bool StoreData( SvStream ) const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/basic include/formula

2014-01-30 Thread Alexandre Vicenzi

 include/basic/sbxdef.hxx   |1 -
 include/formula/errorcodes.hxx |2 --
 include/formula/tokenarray.hxx |8 ++--
 3 files changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 53ba2eefb0d3d6e6c155302479eace25bcf8b657
Author: Alexandre Vicenzi vicenzi.alexan...@gmail.com
Date:   Wed Jan 29 21:57:20 2014 -0200

fdo#63154 Removed unused solar.h ref. in basic and formula

Change-Id: Ibf30f29653568929e65ebd897cef474a6838d5cc
Reviewed-on: https://gerrit.libreoffice.org/7735
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index 333d7f2..35ea07f 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -23,7 +23,6 @@
 
 
 #ifndef __RSC
-#include tools/solar.h
 #include tools/errcode.hxx
 
 enum SbxClassType { // SBX-class-IDs (order is important!)
diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx
index d178aec..cea5787 100644
--- a/include/formula/errorcodes.hxx
+++ b/include/formula/errorcodes.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FORMULA_ERRORCODES_HXX
 
 #include rtl/math.hxx
-#include tools/solar.h
 
 namespace ScErrorCodes
 {
@@ -94,7 +93,6 @@ inline double CreateDoubleError( sal_uInt16 nErr )
 return fVal;
 }
 
-
 /** Recreate the error code of a coded double error, if any. */
 inline sal_uInt16 GetDoubleErrorValue( double fVal )
 {
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 9f8fed0..2dde86d 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -20,11 +20,10 @@
 #ifndef INCLUDED_FORMULA_TOKENARRAY_HXX
 #define INCLUDED_FORMULA_TOKENARRAY_HXX
 
-#include limits.h
+#include com/sun/star/sheet/FormulaToken.hpp
 #include formula/token.hxx
 #include formula/ExternalReferenceHelper.hxx
-#include tools/solar.h
-#include com/sun/star/sheet/FormulaToken.hpp
+#include limits.h
 
 namespace formula
 {
@@ -279,10 +278,7 @@ public:
 private:
 const FormulaToken* GetNonEndOfPathToken( short nIdx ) const;
 };
-// 
=
 } // formula
-// 
=
-
 
 #endif // INCLUDED_FORMULA_TOKENARRAY_HXX
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/basic

2013-11-09 Thread Norbert Thiebaud

 include/basic/basicdllapi.h  |2 +-
 include/basic/basicmanagerrepository.hxx |2 +-
 include/basic/basmgr.hxx |2 +-
 include/basic/basrdll.hxx|2 +-
 include/basic/modsizeexceeded.hxx|2 +-
 include/basic/sbdef.hxx  |2 +-
 include/basic/sbmeth.hxx |2 +-
 include/basic/sbmod.hxx  |2 +-
 include/basic/sbobjmod.hxx   |2 +-
 include/basic/sbprop.hxx |2 +-
 include/basic/sbstar.hxx |2 +-
 include/basic/sbstdobj.hxx   |2 +-
 include/basic/sbuno.hxx  |2 +-
 include/basic/sbx.hxx|8 
 include/basic/sbxbase.hxx|2 +-
 include/basic/sbxcore.hxx|2 +-
 include/basic/sbxdef.hxx |2 +-
 include/basic/sbxfac.hxx |2 +-
 include/basic/sbxform.hxx|2 +-
 include/basic/sbxmeth.hxx|2 +-
 include/basic/sbxobj.hxx |2 +-
 include/basic/sbxprop.hxx|2 +-
 include/basic/sbxvar.hxx |2 +-
 include/basic/vbahelper.hxx  |2 +-
 24 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit 98d48be291ec8e3cb9b51bedbf6f412c3553
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sat Nov 9 13:29:54 2013 -0600

fdo#65108 inter-module includes 

Change-Id: I419a1288bc6120d978fc301f127d5d29298f3ede

diff --git a/include/basic/basicdllapi.h b/include/basic/basicdllapi.h
index ceee64b..3bdd9e5 100644
--- a/include/basic/basicdllapi.h
+++ b/include/basic/basicdllapi.h
@@ -9,7 +9,7 @@
 #ifndef INCLUDED_BASIC_BASICDLLAPI_H
 #define INCLUDED_BASIC_BASICDLLAPI_H
 
-#include sal/types.h
+#include sal/types.h
 
 #if defined(BASIC_DLLIMPLEMENTATION)
 #define BASIC_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
diff --git a/include/basic/basicmanagerrepository.hxx 
b/include/basic/basicmanagerrepository.hxx
index 0895f81..6d0c4cb 100644
--- a/include/basic/basicmanagerrepository.hxx
+++ b/include/basic/basicmanagerrepository.hxx
@@ -22,7 +22,7 @@
 
 #include com/sun/star/frame/XModel.hpp
 #include com/sun/star/embed/XStorage.hpp
-#include basicdllapi.h
+#include basic/basicdllapi.h
 
 class BasicManager;
 
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 409688c..1a2281a 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -23,7 +23,7 @@
 #include basic/sbstar.hxx
 #include com/sun/star/script/XStorageBasedLibraryContainer.hpp
 #include com/sun/star/script/XStarBasicAccess.hpp
-#include basicdllapi.h
+#include basic/basicdllapi.h
 #include vector
 
 // Basic XML Import/Export
diff --git a/include/basic/basrdll.hxx b/include/basic/basrdll.hxx
index b5b8cd7..bf6ba73 100644
--- a/include/basic/basrdll.hxx
+++ b/include/basic/basrdll.hxx
@@ -23,7 +23,7 @@
 class ResMgr;
 
 #include vcl/accel.hxx
-#include basicdllapi.h
+#include basic/basicdllapi.h
 
 class BASIC_DLLPUBLIC BasicDLL
 {
diff --git a/include/basic/modsizeexceeded.hxx 
b/include/basic/modsizeexceeded.hxx
index 66eded1..9acf42f 100644
--- a/include/basic/modsizeexceeded.hxx
+++ b/include/basic/modsizeexceeded.hxx
@@ -22,7 +22,7 @@
 
 #include com/sun/star/task/XInteractionHandler.hpp
 #include cppuhelper/implbase1.hxx
-#include basicdllapi.h
+#include basic/basicdllapi.h
 
 class BASIC_DLLPUBLIC ModuleSizeExceeded : public ::cppu::WeakImplHelper1 
::com::sun::star::task::XInteractionRequest 
 {
diff --git a/include/basic/sbdef.hxx b/include/basic/sbdef.hxx
index 932d7e8..1444241 100644
--- a/include/basic/sbdef.hxx
+++ b/include/basic/sbdef.hxx
@@ -22,7 +22,7 @@
 
 #include basic/sbxdef.hxx
 #include rtl/ustring.hxx
-#include basicdllapi.h
+#include basic/basicdllapi.h
 
 // Returns type name for Basic type, array flag is ignored
 // implementation: basic/source/runtime/methods.cxx
diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx
index b8f0a17..9a3fd88 100644
--- a/include/basic/sbmeth.hxx
+++ b/include/basic/sbmeth.hxx
@@ -23,7 +23,7 @@
 #include tools/errcode.hxx
 #include basic/sbxmeth.hxx
 #include basic/sbdef.hxx
-#include basicdllapi.h
+#include basic/basicdllapi.h
 
 class SbModule;
 
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index dc88fd7..62e3ebe 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -28,7 +28,7 @@
 #include vector
 #include deque
 #include boost/utility.hpp
-#include basicdllapi.h
+#include basic/basicdllapi.h
 #include basic/codecompletecache.hxx
 
 class SbMethod;
diff --git a/include/basic/sbobjmod.hxx b/include/basic/sbobjmod.hxx
index ee0444d..faa560a 100644
--- a/include/basic/sbobjmod.hxx
+++ b/include/basic/sbobjmod.hxx
@@ -27,7 +27,7 @@
 #include com/sun/star/lang/XEventListener.hpp
 #include com/sun/star/awt/XDialog.hpp
 #include com/sun/star/frame/XModel.hpp
-#include basicdllapi.h
+#include basic/basicdllapi.h
 
 //

[Libreoffice-commits] core.git: include/basic

[Libreoffice-commits] core.git: include/basic include/connectivity include/ucbhelper include/vcl

[Libreoffice-commits] core.git: include/basic

[Libreoffice-commits] core.git: include/basic

[Libreoffice-commits] core.git: include/basic include/rtl include/svx

[Libreoffice-commits] core.git: include/basic

[Libreoffice-commits] core.git: include/basic

[Libreoffice-commits] core.git: include/basic

[Libreoffice-commits] core.git: include/basic include/editeng include/store include/svtools include/vcl reportdesign/source sal/rtl store/source sw/source

[Libreoffice-commits] core.git: include/basic sc/source

[Libreoffice-commits] core.git: include/basic include/editeng include/svtools include/svx include/vcl sc/inc sc/source sd/inc sd/source sfx2/source svtools/source svx/source sw/inc sw/source uui/inc u

[Libreoffice-commits] core.git: include/basic

[Libreoffice-commits] core.git: include/basic

[Libreoffice-commits] core.git: include/basic

[Libreoffice-commits] core.git: include/basic

[Libreoffice-commits] core.git: include/basic

[Libreoffice-commits] core.git: include/basic

[Libreoffice-commits] core.git: include/basic include/formula

[Libreoffice-commits] core.git: include/basic

19 matches

Site Navigation

Mail list logo

Footer information