diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 11:01:13 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 11:01:13 +0000 |
commit | 1c08c265487d696b92979c8890470efe0cbfa95c (patch) | |
tree | 013b8931ec94271db465014cb9b263378a6e14db /sc/inc/address.hxx | |
parent | fa9f4faf3a00db816a79302001003f6ad47c93e1 (diff) |
#i10000#: fix merge conflicts (CWS frmdlg)
Diffstat (limited to 'sc/inc/address.hxx')
-rw-r--r-- | sc/inc/address.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index 4c9abc4df4a7..7b128b4b1abd 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -319,7 +319,7 @@ public: inline void GetVars( SCCOL& nColP, SCROW& nRowP, SCTAB& nTabP ) const { nColP = nCol; nRowP = nRow; nTabP = nTab; } - USC_DLLPUBLIC USHORT Parse( const String&, ScDocument* = NULL, + SC_DLLPUBLIC USHORT Parse( const String&, ScDocument* = NULL, const Details& rDetails = detailsOOOa1, ExternalInfo* pExtInfo = NULL, const ::com::sun::star::uno::Sequence< |