summaryrefslogtreecommitdiffstats
path: root/basic/inc
diff options
context:
space:
mode:
Diffstat (limited to 'basic/inc')
-rw-r--r--basic/inc/basic.hrc4
-rw-r--r--basic/inc/pch/precompiled_sb.hxx53
-rw-r--r--basic/inc/sbxbase.hxx3
-rw-r--r--basic/inc/sbxfac.hxx1
-rw-r--r--basic/inc/sbxform.hxx32
-rw-r--r--basic/inc/strings.hrc2
6 files changed, 34 insertions, 61 deletions
diff --git a/basic/inc/basic.hrc b/basic/inc/basic.hrc
index 79b940a38a1e..6245a5d76d30 100644
--- a/basic/inc/basic.hrc
+++ b/basic/inc/basic.hrc
@@ -21,11 +21,11 @@
#include <basic/sberrors.hxx>
#include <unotools/resmgr.hxx>
-#include <vcl/errcode.hxx>
+#include <comphelper/errcode.hxx>
#include <utility>
-#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
+#define NC_(Context, String) TranslateId(Context, u8##String)
std::pair<TranslateId, ErrCode> const RID_BASIC_START[] =
{
diff --git a/basic/inc/pch/precompiled_sb.hxx b/basic/inc/pch/precompiled_sb.hxx
index d327c88c5f58..47e336d1cce0 100644
--- a/basic/inc/pch/precompiled_sb.hxx
+++ b/basic/inc/pch/precompiled_sb.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2021-09-12 11:49:52 using:
+ Generated on 2022-06-27 18:57:27 using:
./bin/update_pch basic sb --cutoff=2 --exclude:system --exclude:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -24,6 +24,7 @@
#if PCH_LEVEL >= 1
#include <chrono>
#include <cstddef>
+#include <limits>
#include <math.h>
#include <memory>
#include <ostream>
@@ -31,13 +32,13 @@
#include <stdlib.h>
#include <string_view>
#include <type_traits>
+#include <utility>
#include <vector>
#endif // PCH_LEVEL >= 1
#if PCH_LEVEL >= 2
#include <osl/endian.h>
#include <osl/file.hxx>
#include <osl/process.h>
-#include <osl/thread.h>
#include <osl/time.h>
#include <rtl/character.hxx>
#include <rtl/math.h>
@@ -50,75 +51,45 @@
#include <sal/log.hxx>
#include <sal/saldllapi.h>
#include <sal/types.h>
-#include <vcl/bitmap.hxx>
-#include <vcl/cairo.hxx>
-#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
-#include <vcl/errcode.hxx>
-#include <vcl/font.hxx>
+#include <comphelper/errcode.hxx>
#include <vcl/graph.hxx>
#include <vcl/mapmod.hxx>
-#include <vcl/metaactiontypes.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/region.hxx>
-#include <vcl/rendercontext/AddFontSubstituteFlags.hxx>
-#include <vcl/rendercontext/AntialiasingFlags.hxx>
-#include <vcl/rendercontext/DrawGridFlags.hxx>
-#include <vcl/rendercontext/DrawImageFlags.hxx>
-#include <vcl/rendercontext/DrawModeFlags.hxx>
-#include <vcl/rendercontext/DrawTextFlags.hxx>
-#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
-#include <vcl/rendercontext/ImplMapRes.hxx>
-#include <vcl/rendercontext/InvertFlags.hxx>
-#include <vcl/rendercontext/RasterOp.hxx>
-#include <vcl/rendercontext/SalLayoutFlags.hxx>
-#include <vcl/rendercontext/State.hxx>
-#include <vcl/rendercontext/SystemTextColorFlags.hxx>
-#include <vcl/salnativewidgets.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/vclreferencebase.hxx>
-#include <vcl/wall.hxx>
#include <vcl/weld.hxx>
+#include <vcl/wintypes.hxx>
#endif // PCH_LEVEL >= 2
#if PCH_LEVEL >= 3
#include <basegfx/color/bcolor.hxx>
-#include <basegfx/numeric/ftools.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/vector/b2enums.hxx>
-#include <com/sun/star/awt/DeviceInfo.hpp>
-#include <com/sun/star/drawing/LineCap.hpp>
+#include <com/sun/star/i18n/TransliterationModules.hpp>
+#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
-#include <cppuhelper/weakref.hxx>
#include <i18nlangtag/lang.h>
-#include <o3tl/char16_t2wchar_t.hxx>
+#include <i18nutil/transliteration.hxx>
#include <o3tl/cow_wrapper.hxx>
-#include <o3tl/float_int_conversion.hxx>
#include <o3tl/safeint.hxx>
+#include <o3tl/string_view.hxx>
+#include <o3tl/typed_flags_set.hxx>
#include <svl/SfxBroadcaster.hxx>
#include <svl/numformat.hxx>
#include <svl/zforlist.hxx>
#include <tools/color.hxx>
#include <tools/debug.hxx>
-#include <tools/gen.hxx>
#include <tools/link.hxx>
#include <tools/mapunit.hxx>
-#include <tools/poly.hxx>
#include <tools/ref.hxx>
-#include <tools/solar.h>
#include <tools/stream.hxx>
#include <tools/toolsdllapi.h>
#include <tools/urlobj.hxx>
-#include <tools/wintypes.hxx>
#include <unotools/charclass.hxx>
-#include <unotools/fontdefs.hxx>
#include <unotools/syslocale.hxx>
+#include <unotools/transliterationwrapper.hxx>
#include <unotools/unotoolsdllapi.h>
#endif // PCH_LEVEL >= 3
#if PCH_LEVEL >= 4
@@ -129,10 +100,12 @@
#include <basic/sbstar.hxx>
#include <basic/sbuno.hxx>
#include <basic/sbx.hxx>
+#include <basic/sbxcore.hxx>
#include <basic/sbxmeth.hxx>
#include <basic/sbxobj.hxx>
#include <basic/sbxvar.hxx>
#include <date.hxx>
+#include <global.hxx>
#include <iosys.hxx>
#include <rtlproto.hxx>
#include <runtime.hxx>
diff --git a/basic/inc/sbxbase.hxx b/basic/inc/sbxbase.hxx
index 80552c2fbf08..15a16a4ac113 100644
--- a/basic/inc/sbxbase.hxx
+++ b/basic/inc/sbxbase.hxx
@@ -23,7 +23,7 @@
#include <basic/sbxvar.hxx>
#include <i18nlangtag/lang.h>
-#include <vcl/errcode.hxx>
+#include <comphelper/errcode.hxx>
#include <memory>
#include <vector>
@@ -36,6 +36,7 @@ class SbxBasicFormater;
struct SbxAppData
{
ErrCode eErrCode; // Error code
+ OUString aErrorMsg; // Error message for $ARG
SbxVariableRef m_aGlobErr; // Global error object
std::vector<SbxFactory*> m_Factories; // these are owned by fields in SbiGlobals
tools::SvRef<SvRefBase> mrImplRepository;
diff --git a/basic/inc/sbxfac.hxx b/basic/inc/sbxfac.hxx
index bbdbcb018f0b..5493a6687e00 100644
--- a/basic/inc/sbxfac.hxx
+++ b/basic/inc/sbxfac.hxx
@@ -26,7 +26,6 @@ class SbxFactory
{
public:
virtual ~SbxFactory();
- SbxFactory() {}
virtual SbxBaseRef Create(sal_uInt16 nSbxId, sal_uInt32);
virtual SbxObjectRef CreateObject(const OUString&);
};
diff --git a/basic/inc/sbxform.hxx b/basic/inc/sbxform.hxx
index 8173c8ed87b7..49ef777866c0 100644
--- a/basic/inc/sbxform.hxx
+++ b/basic/inc/sbxform.hxx
@@ -74,14 +74,14 @@ class SbxBasicFormater {
// Constructor takes signs for decimal point, thousand separation sign
// and necessary resource strings.
SbxBasicFormater( sal_Unicode _cDecPoint, sal_Unicode _cThousandSep,
- const OUString& _sOnStrg,
- const OUString& _sOffStrg,
- const OUString& _sYesStrg,
- const OUString& _sNoStrg,
- const OUString& _sTrueStrg,
- const OUString& _sFalseStrg,
- const OUString& _sCurrencyStrg,
- const OUString& _sCurrencyFormatStrg );
+ OUString _sOnStrg,
+ OUString _sOffStrg,
+ OUString _sYesStrg,
+ OUString _sNoStrg,
+ OUString _sTrueStrg,
+ OUString _sFalseStrg,
+ OUString _sCurrencyStrg,
+ OUString _sCurrencyFormatStrg );
/* Basic command: Format$( number,format-string )
@@ -93,9 +93,9 @@ class SbxBasicFormater {
String containing the formatted output
*/
OUString BasicFormat( double dNumber, const OUString& sFormatStrg );
- static OUString BasicFormatNull( const OUString& sFormatStrg );
+ static OUString BasicFormatNull( std::u16string_view sFormatStrg );
- static bool isBasicFormat( const OUString& sFormatStrg );
+ static bool isBasicFormat( std::u16string_view sFormatStrg );
private:
static inline void ShiftString( OUStringBuffer& sStrg, sal_uInt16 nStartPos );
@@ -112,11 +112,11 @@ class SbxBasicFormater {
short GetDigitAtPosExpScan( double dNewExponent, short nPos,
bool& bFoundFirstDigit );
short GetDigitAtPosExpScan( short nPos, bool& bFoundFirstDigit );
- static OUString GetPosFormatString( const OUString& sFormatStrg, bool & bFound );
- static OUString GetNegFormatString( const OUString& sFormatStrg, bool & bFound );
- static OUString Get0FormatString( const OUString& sFormatStrg, bool & bFound );
- static OUString GetNullFormatString( const OUString& sFormatStrg, bool & bFound );
- static void AnalyseFormatString( const OUString& sFormatStrg,
+ static OUString GetPosFormatString( std::u16string_view sFormatStrg, bool & bFound );
+ static OUString GetNegFormatString( std::u16string_view sFormatStrg, bool & bFound );
+ static OUString Get0FormatString( std::u16string_view sFormatStrg, bool & bFound );
+ static OUString GetNullFormatString( std::u16string_view sFormatStrg, bool & bFound );
+ static void AnalyseFormatString( std::u16string_view sFormatStrg,
short& nNoOfDigitsLeft, short& nNoOfDigitsRight,
short& nNoOfOptionalDigitsLeft,
short& nNoOfExponentDigits,
@@ -124,7 +124,7 @@ class SbxBasicFormater {
bool& bPercent, bool& bCurrency, bool& bScientific,
bool& bGenerateThousandSeparator,
short& nMultipleThousandSeparators );
- void ScanFormatString( double dNumber, const OUString& sFormatStrg,
+ void ScanFormatString( double dNumber, std::u16string_view sFormatStrg,
OUString& sReturnStrg, bool bCreateSign );
//*** Data ***
diff --git a/basic/inc/strings.hrc b/basic/inc/strings.hrc
index 64b65db342cc..53a8da5c40fd 100644
--- a/basic/inc/strings.hrc
+++ b/basic/inc/strings.hrc
@@ -19,7 +19,7 @@
#pragma once
-#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
+#define NC_(Context, String) TranslateId(Context, u8##String)
#define STR_BASICKEY_FORMAT_ON NC_("STR_BASICKEY_FORMAT_ON", "On")
#define STR_BASICKEY_FORMAT_OFF NC_("STR_BASICKEY_FORMAT_OFF", "Off")
generated by cgit (git 2.34.1) at 2024-04-30 23:41:11 +0000