summaryrefslogtreecommitdiff
path: root/sw/source/ui/app/apphdl.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/app/apphdl.cxx')
-rw-r--r--sw/source/ui/app/apphdl.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 653208aaf250..9ed011cdad78 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -202,7 +202,7 @@ void SwModule::StateOther(SfxItemSet &rSet)
}
break;
case SID_ATTR_METRIC:
- rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, static_cast< UINT16 >(::GetDfltMetric(bWebView))));
+ rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, static_cast< sal_uInt16 >(::GetDfltMetric(bWebView))));
break;
case FN_SET_MODOPT_TBLNUMFMT:
rSet.Put( SfxBoolItem( nWhich, pModuleConfig->
@@ -225,7 +225,7 @@ SwView* lcl_LoadDoc(SwView* pView, const String& rURL)
{
SfxStringItem aURL(SID_FILE_NAME, rURL);
SfxStringItem aTargetFrameName( SID_TARGETNAME, String::CreateFromAscii("_blank") );
- SfxBoolItem aHidden( SID_HIDDEN, TRUE );
+ SfxBoolItem aHidden( SID_HIDDEN, sal_True );
SfxStringItem aReferer(SID_REFERER, pView->GetDocShell()->GetTitle());
SfxObjectItem* pItem = (SfxObjectItem*)pView->GetViewFrame()->GetDispatcher()->
Execute(SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
@@ -337,7 +337,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
m_pMMConfig->SetSourceView( m_pView );
m_pView->SetMailMergeConfigItem(0, 0, sal_True);
SfxViewFrame* pViewFrame = m_pView->GetViewFrame();
- pViewFrame->ShowChildWindow(FN_MAILMERGE_CHILDWINDOW, FALSE);
+ pViewFrame->ShowChildWindow(FN_MAILMERGE_CHILDWINDOW, sal_False);
DBG_ASSERT(m_pMMConfig, "no MailMergeConfigItem available");
bRestoreWizard = true;
}
@@ -750,7 +750,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
}
else if(rHint.ISA(SfxSimpleHint))
{
- USHORT nHintId = ((SfxSimpleHint&)rHint).GetId();
+ sal_uInt16 nHintId = ((SfxSimpleHint&)rHint).GetId();
if(SFX_HINT_DEINITIALIZING == nHintId)
{
DELETEZ(pWebUsrPref);
@@ -798,7 +798,7 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, sal
{
if( pBrdCst == pUserOptions )
{
- bAuthorInitialised = FALSE;
+ bAuthorInitialised = sal_False;
}
else if( pBrdCst == pUndoOptions )
{
@@ -817,7 +817,7 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, sal
pDocShell = (SwDocShell*)SfxObjectShell::GetNext(*pDocShell, &aType);
}
}
- SwEditShell::SetUndoActionCount( static_cast< USHORT >(nNew));
+ SwEditShell::SetUndoActionCount( static_cast< sal_uInt16 >(nNew));
}
else if ( pBrdCst == pColorConfig || pBrdCst == pAccessibilityOptions )
{
@@ -952,11 +952,11 @@ const SwMasterUsrPref *SwModule::GetUsrPref(sal_Bool bWeb) const
{
// im Load der SwMasterUsrPref wird der SpellChecker gebraucht, dort darf
// er aber nicht angelegt werden #58256#
- pNonConstModule->pWebUsrPref = new SwMasterUsrPref(TRUE);
+ pNonConstModule->pWebUsrPref = new SwMasterUsrPref(sal_True);
}
else if(!bWeb && !pUsrPref)
{
- pNonConstModule->pUsrPref = new SwMasterUsrPref(FALSE);
+ pNonConstModule->pUsrPref = new SwMasterUsrPref(sal_False);
}
return bWeb ? pWebUsrPref : pUsrPref;
}
ight'> Already check at the end of input analysis whether it could be an ISO date to not apply x-y-z onto MDY or DMY later. For an acceptable ISO input, apart from M and D restrictions, Y-M-D year numbers must be greater than 12 in MDY order or greater than 31 in DMY order, or have at least 3 digits (possibly leading 0). Change-Id: I8d3eb7e2403421469050850e45d1db5c0be018f5 2017-08-30Related: tdf#91758 don't remember nCanForceToIso8601 stateEike Rathke CanForceToIso8601() can be called twice for different DateOrder. Change-Id: I656d499b8a557814326fe71333fcb644c7d3e909 2017-08-04rename Anz->Cnt in svlNoel Grandin Change-Id: Ibe9ad8c1bfbb336ee1f02edf0f619220cfcee375 Reviewed-on: https://gerrit.libreoffice.org/40744 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2017-08-03rename nAnzNum->nNumericsCntNoel Grandin Change-Id: I798314c9c17f4341fa9c5fc87be4fc72a07e7d9e Reviewed-on: https://gerrit.libreoffice.org/40709 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> 2017-08-03rename SV_MAX_ANZ_INPUT_STRINGS->SV_MAX_COUNT_INPUT_STRINGSNoel Grandin Change-Id: Ib915eb709966b7a487e54694ae3be7e5c2d3a452 Reviewed-on: https://gerrit.libreoffice.org/40701 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2017-08-03rename nAnzStrings -> nStringsCntNoel Grandin Change-Id: I387b702a0bc785a8e9da4e0390067626c5475319 Reviewed-on: https://gerrit.libreoffice.org/40674 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> 2017-07-17extend loplugin useuniqueptr to OUString pointersNoel Grandin Change-Id: Ieb5bab3895e1edaff497c4a1a88303ccac097edc Reviewed-on: https://gerrit.libreoffice.org/39948 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2017-05-04Number formatter: handle negative signed year date as BCEEike Rathke Accept input -YYYY-MM-DD or -Y/M/D or M/D/-Y or D.M.-Y ... and display likewise if no era word is to be displayed. Change-Id: I199d34354d5b91dbe2a6a6ac3ae4b50d5dbde670 2017-04-13convert DateFormat to scoped enum and rename to DateOrderNoel Grandin Change-Id: I71d7a7755a5c20d5146d1ad7e96ca22b7823173a Reviewed-on: https://gerrit.libreoffice.org/36517 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> 2017-03-22Use rtl::isAscii* instead of ctype.h is* with sal_Unicode argStephan Bergmann Change-Id: I744f774e6e43866f1c6ef9ff8de2d9f2e183f0be 2017-03-03Remove redundant 'inline' keywordStephan Bergmann ...from function definitions occurring within class definitions. Done with a rewriting Clang plugin (to be pushed later). Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8 Reviewed-on: https://gerrit.libreoffice.org/34874 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2016-08-11Fix comments to match new reality: these are no longer optional parametersTor Lillqvist Change-Id: Idf054aa4ef095ce37f05a01adf59cb450a6906c6 2016-08-11loplugin:countusersofdefaultparams in svl..unodevtoolsNoel Grandin Change-Id: Ie3d2cf29e99b8a51b80246aafa23a92e6c3404b2 Reviewed-on: https://gerrit.libreoffice.org/28017 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com> 2016-07-29loplugin:countusersofdefaultparams in store..svtoolsNoel Grandin Change-Id: I15b4400bddc5a4d0e3de5dfffe18b7e493f97df6 Reviewed-on: https://gerrit.libreoffice.org/27580 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com> 2016-07-08Resolves: tdf#100452 class Date full (BCE,CE) proleptic Gregorian calendarEike Rathke ... implementing signed years with year 0 gap. Date(31,12,-1) last day BCE Date(1,1,1) first day CE New class Date member functions: * AddYears(sal_Int16) to be used instead of aDate.SetYear(aDate.GetYear()+sal_Int16) to handle year 0 gap. * convenience GetNextYear() to be used insted of GetYear()+1 * convenience GetPrevYear() to be used insted of GetYear()-1 * AddMonths(sal_Int32) * operator=(const css::util::Date&) New class DateTime member functions: * operator=(const css::util::DateTime&) Made some conversion ctors explicit, specifically Date(sal_Int32) Adapted hopefully all places that used a sal_uInt16 year to use sal_Int16 where appropriate. Eliminated some quirks in date handling found on the fly. Added era handling to i18npool icu calendar setting interface, which missing was responsible for 0001-01-01 entered in Calc being set as -0001-01-01, hence subtracting one day resulted in -0002-12-31. Change-Id: I77b39fba9599ebd5067d7864f6c9ebe01f6f578f Reviewed-on: https://gerrit.libreoffice.org/27049 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> 2016-06-28loplugin:singlevalfields in variousNoel Grandin Change-Id: Ia0d8f463a4dba9ec63aa0159441e3e607dd3bf5e Reviewed-on: https://gerrit.libreoffice.org/26738 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com> 2015-11-10loplugin:nullptr (automatic rewrite)Stephan Bergmann Change-Id: I0f2f81dae91f62639e79799b1bed1b2df1fd79ab 2015-10-29com::sun::star->css in starmath,stoc,svgio,svlNoel Grandin Change-Id: If4308b358a55351f6e951ebf055df076ce4ad4ce Reviewed-on: https://gerrit.libreoffice.org/19667 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com> 2015-10-12Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY codeStephan Bergmann Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3 2015-08-12cppcheck: noCopyConstructorCaolán McNamara Change-Id: I62da241f237b17fc192dd586bcd35b5bd6ea284a 2015-08-06Resolves: tdf#93080 short day name and month name may interfereEike Rathke Change-Id: I088633e4cff278e1add8eeea8828f9ba9c9fb140 2015-07-04Fix typosAndrea Gelmini Change-Id: Ic6415423f46aaee7ba90239a617c318cf92ae222 Reviewed-on: https://gerrit.libreoffice.org/16711 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com> 2015-06-16Fix typosAndrea Gelmini Change-Id: Icfb885b72d51edc886851cf503c56fa12b8f559f Reviewed-on: https://gerrit.libreoffice.org/16309 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> 2015-06-16Fix typosAndrea Gelmini Change-Id: Ieaf67cf597e05dbae5affa153af907fda4462a41 Reviewed-on: https://gerrit.libreoffice.org/16295 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> 2015-06-08cppcheck: noExplicitConstructorCaolán McNamara Change-Id: I8b03c27188b02c3c4a9a9fbbe0df1fb1ae1c5caf 2015-04-02loplugin:staticmethodsNoel Grandin Change-Id: Ibf0c73ac17ec19ed672f66907db47057920babca 2014-05-17resolved fdo#41166 match month and day name word instead of substringEike Rathke Change-Id: I897dbcee47de574d91ba3e3b40a39a35b779fef8 2014-03-05Work around unfortunate libstdc++ interpretation of C++ cmath requirementsStephan Bergmann ...that causes a call to std::abs with a short argument to effectively select the double overload (via a template added with <http://gcc.gnu.org/git/ ?p=gcc.git;a=commit;h=8c0edf5c2aad076cbc805299ed82845ae049f4f6> "include/c_std/cmath (abs(_Tp)): Add"), see <http://www.open-std.org/jtc1/sc22/wg21/docs/lwg-toc.html#2192> "Validity and return type of std::abs(0u) is unclear" for details. The workaround is to use int instead of short arguments (and make sure the integral overloads of std::abs from cstdlib are available). Change-Id: If95363f9a54abb9cb1a57fd4828c4b91c12bc4be 2013-11-06Make TransformInput() a non-member function.Kohei Yoshida Change-Id: Ieb077b6ce661e2885d6010519f137235a048f9df 2013-10-28fixincludeguards.sh: svlThomas Arnhold Change-Id: I70ef44216fb7ddb4e12b9d90406b45cc594279f0