[Libreoffice-commits] core.git: 25 commits - canvas/source cui/source helpcompiler/inc i18npool/inc i18npool/source idl/inc include/canvas include/i18nutil lingucomponent/source sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk sd/qa svx/source sw/source ucb/source vcl/source xmloff/source
Caolán McNamara
caolanm at redhat.com
Tue Feb 11 06:34:08 PST 2014
canvas/source/opengl/ogl_spritecanvas.cxx | 3
canvas/source/opengl/ogl_spritecanvas.hxx | 4
cui/source/dialogs/cuigaldlg.cxx | 4
helpcompiler/inc/HelpLinker.hxx | 8
i18npool/inc/textconversion.hxx | 5
i18npool/source/localedata/saxparser.cxx | 1
i18npool/source/textconversion/textconversion.cxx | 3
i18npool/source/textconversion/textconversion_ko.cxx | 3
i18npool/source/textconversion/textconversion_zh.cxx | 3
idl/inc/hash.hxx | 33 +-
include/canvas/base/bufferedgraphicdevicebase.hxx | 4
include/i18nutil/casefolding.hxx | 6
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 1
sc/AllLangResTarget_sc.mk | 1
sc/UIConfig_scalc.mk | 1
sc/inc/sc.hrc | 1
sc/source/filter/xml/xmlexprt.cxx | 6
sc/source/ui/app/inputhdl.cxx | 1
sc/source/ui/inc/highred.hrc | 46 ---
sc/source/ui/inc/highred.hxx | 20 -
sc/source/ui/miscdlgs/highred.cxx | 176 ++++++-------
sc/source/ui/miscdlgs/highred.src | 101 -------
sc/source/ui/unoobj/appluno.cxx | 6
sc/source/ui/view/prevwsh.cxx | 4
sc/uiconfig/scalc/ui/showchangesdialog.ui | 251 +++++++++++++++++++
sd/qa/unit/import-tests.cxx | 1
svx/source/dialog/imapimp.hxx | 8
svx/source/sidebar/line/LinePropertyPanel.cxx | 2
svx/source/stbctrls/zoomctrl.cxx | 7
sw/source/core/unocore/unoportenum.cxx | 2
ucb/source/ucp/cmis/cmis_content.cxx | 2
ucb/source/ucp/cmis/cmis_content.hxx | 3
vcl/source/filter/FilterConfigItem.cxx | 1
vcl/source/gdi/region.cxx | 2
xmloff/source/text/txtfldi.cxx | 1
xmloff/source/text/txtparai.cxx | 1
36 files changed, 418 insertions(+), 304 deletions(-)
New commits:
commit 27ad211cd382a3800b1ed56ec7cb3bb9321582ce
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 13:37:34 2014 +0000
convert show changes dialog to .ui
Change-Id: I29397e454e30bff98644f0c9e0f3a8e00547af1b
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index e56cafc..7625aef 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -57,7 +57,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/drawfunc/drformsh.src \
sc/source/ui/drawfunc/objdraw.src \
sc/source/ui/miscdlgs/retypepassdlg.src \
- sc/source/ui/miscdlgs/highred.src \
sc/source/ui/miscdlgs/conflictsdlg.src \
sc/source/ui/miscdlgs/acredlin.src \
sc/source/ui/formdlg/dwfunctr.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 0e9c1fd..28709b5 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -143,6 +143,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sharedocumentdlg \
sc/uiconfig/scalc/ui/sharedfooterdialog \
sc/uiconfig/scalc/ui/sharedheaderdialog \
+ sc/uiconfig/scalc/ui/showchangesdialog \
sc/uiconfig/scalc/ui/showsheetdialog \
sc/uiconfig/scalc/ui/sidebaralignment \
sc/uiconfig/scalc/ui/sidebarnumberformat \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index a733aec..c0a35e0 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1063,7 +1063,6 @@
#define RID_NAVIPI_SCENARIO_DELETE (SC_DIALOGS_START + 121)
#define RID_NAVIPI_SCENARIO_EDIT (SC_DIALOGS_START + 122)
-#define RID_SCDLG_HIGHLIGHT_CHANGES (SC_DIALOGS_START + 123)
#define RID_SCPAGE_OPREDLINE (SC_DIALOGS_START + 124)
#define WID_SIMPLE_REF (SC_DIALOGS_START + 126)
diff --git a/sc/source/ui/inc/highred.hrc b/sc/source/ui/inc/highred.hrc
deleted file mode 100644
index 0df9dd4..0000000
--- a/sc/source/ui/inc/highred.hrc
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "sc.hrc"
-
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 5
-
-#define CB_HIGHLIGHT_ACCEPT 6
-#define CB_HIGHLIGHT_REJECT 7
-
-#define FL_FILTER 10
-#define CB_HIGHLIGHT 13
-
-#define FT_ASSIGN 14
-#define ED_ASSIGN 15
-#define RB_ASSIGN 16
-
-#define STR_INSERT_COLS 20
-#define STR_INSERT_ROWS 21
-#define STR_INSERT_TABS 22
-#define STR_DELETE_COLS 23
-#define STR_DELETE_ROWS 24
-#define STR_DELETE_TABS 25
-#define STR_MOVE 26
-#define STR_CONTENT 27
-#define STR_REJECT 28
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx
index 61d9a8c..6370eba 100644
--- a/sc/source/ui/inc/highred.hxx
+++ b/sc/source/ui/inc/highred.hxx
@@ -53,25 +53,19 @@ class ScDocument;
class ScHighlightChgDlg : public ScAnyRefDlg
{
private:
+ CheckBox* m_pHighlightBox;
+ SvxTPFilter* m_pFilterCtr;
+ CheckBox* m_pCbAccept;
+ CheckBox* m_pCbReject;
+ OKButton* m_pOkButton;
- CheckBox aHighlightBox;
- FixedLine aFlFilter;
- SvxTPFilter aFilterCtr;
- CheckBox aCbAccept;
- CheckBox aCbReject;
-
- OKButton aOkButton;
- CancelButton aCancelButton;
- HelpButton aHelpButton;
-
- formula::RefEdit aEdAssign;
- formula::RefButton aRbAssign;
+ formula::RefEdit* m_pEdAssign;
+ formula::RefButton* m_pRbAssign;
ScViewData* pViewData;
ScDocument* pDoc;
ScRangeName aLocalRangeName;
Selection theCurSel;
- Size MinSize;
ScRangeList aRangeList;
ScChangeViewSettings aChangeViewSet;
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index 02538d5..f18a9db 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -23,7 +23,6 @@
#include "docsh.hxx"
#include "scresid.hxx"
#include "globstr.hrc"
-#include "highred.hrc"
#include "highred.hxx"
#include <vcl/msgbox.hxx>
@@ -43,50 +42,37 @@
//----------------------------------------------------------------------------
ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
ScViewData* ptrViewData)
-
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_HIGHLIGHT_CHANGES ),
- //
- aHighlightBox ( this, ScResId( CB_HIGHLIGHT)),
- aFlFilter ( this, ScResId( FL_FILTER)),
- aFilterCtr ( this),
- aCbAccept ( this, ScResId( CB_HIGHLIGHT_ACCEPT)),
- aCbReject ( this, ScResId( CB_HIGHLIGHT_REJECT)),
- aOkButton ( this, ScResId( BTN_OK ) ),
- aCancelButton ( this, ScResId( BTN_CANCEL ) ),
- aHelpButton ( this, ScResId( BTN_HELP ) ),
- aEdAssign ( this, this, NULL, ScResId( ED_ASSIGN ) ),
- aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ),
- //
- pViewData ( ptrViewData ),
- pDoc ( ptrViewData->GetDocument() ),
- aLocalRangeName ( *(pDoc->GetRangeName()) )
+ : ScAnyRefDlg(pB, pCW, pParent, "ShowChangesDialog",
+ "modules/scalc/ui/showchangesdialog.ui")
+ , pViewData(ptrViewData)
+ , pDoc(ptrViewData->GetDocument())
+ , aLocalRangeName(*(pDoc->GetRangeName()))
{
- FreeResource();
-
- aFilterCtr.HideRange(false);
- Size aCtrSize(LogicToPixel(Size(261 , 86), MAP_APPFONT));
- aFilterCtr.SetSizePixel(aCtrSize);
-
- Point aFlFilterPt( aFlFilter.GetPosPixel() );
- aFlFilterPt.Y() += aFlFilter.GetSizePixel().Height();
- aFilterCtr.SetPosPixel( aFlFilterPt );
- MinSize=aFilterCtr.GetSizePixel();
- MinSize.Height()+=2;
- MinSize.Width()+=2;
- aOkButton.SetClickHdl(LINK( this, ScHighlightChgDlg, OKBtnHdl));
- aHighlightBox.SetClickHdl(LINK( this, ScHighlightChgDlg, HighlightHandle ));
- aFilterCtr.SetRefHdl(LINK( this, ScHighlightChgDlg, RefHandle ));
- aFilterCtr.Show();
+ m_pFilterCtr = new SvxTPFilter(get<VclContainer>("box"));
+ get(m_pHighlightBox, "showchanges");
+ get(m_pCbAccept, "showaccepted");
+ get(m_pCbReject, "showrejected");
+ get(m_pEdAssign, "range");
+ m_pEdAssign->SetReferences(this, m_pFilterCtr->get<Window>("range"));
+ m_pEdAssign->SetSizePixel(m_pEdAssign->get_preferred_size());
+ get(m_pRbAssign, "rangeref");
+ m_pRbAssign->SetReferences(this, m_pEdAssign);
+ get(m_pOkButton, "ok");
+
+ m_pOkButton->SetClickHdl(LINK( this, ScHighlightChgDlg, OKBtnHdl));
+ m_pHighlightBox->SetClickHdl(LINK( this, ScHighlightChgDlg, HighlightHandle ));
+ m_pFilterCtr->SetRefHdl(LINK( this, ScHighlightChgDlg, RefHandle ));
+ m_pFilterCtr->HideRange(false);
+ m_pFilterCtr->Show();
SetDispatcherLock( true );
Init();
-
- aFilterCtr.SetAccessibleRelationMemberOf(&aFlFilter);
}
ScHighlightChgDlg::~ScHighlightChgDlg()
{
SetDispatcherLock( false );
+ delete m_pFilterCtr;
}
void ScHighlightChgDlg::Init()
@@ -99,11 +85,11 @@ void ScHighlightChgDlg::Init()
if(pChanges!=NULL)
{
aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser());
- aFilterCtr.ClearAuthors();
+ m_pFilterCtr->ClearAuthors();
const std::set<OUString>& rUserColl = pChanges->GetUserCollection();
std::set<OUString>::const_iterator it = rUserColl.begin(), itEnd = rUserColl.end();
for (; it != itEnd; ++it)
- aFilterCtr.InsertAuthor(*it);
+ m_pFilterCtr->InsertAuthor(*it);
}
@@ -111,40 +97,40 @@ void ScHighlightChgDlg::Init()
if(pViewSettings!=NULL)
aChangeViewSet=*pViewSettings;
- aHighlightBox.Check(aChangeViewSet.ShowChanges());
- aFilterCtr.CheckDate(aChangeViewSet.HasDate());
- aFilterCtr.SetFirstDate(aChangeViewSet.GetTheFirstDateTime());
- aFilterCtr.SetFirstTime(aChangeViewSet.GetTheFirstDateTime());
- aFilterCtr.SetLastDate(aChangeViewSet.GetTheLastDateTime());
- aFilterCtr.SetLastTime(aChangeViewSet.GetTheLastDateTime());
- aFilterCtr.SetDateMode((sal_uInt16)aChangeViewSet.GetTheDateMode());
- aFilterCtr.CheckAuthor(aChangeViewSet.HasAuthor());
- aFilterCtr.CheckComment(aChangeViewSet.HasComment());
- aFilterCtr.SetComment(aChangeViewSet.GetTheComment());
-
- aCbAccept.Check(aChangeViewSet.IsShowAccepted());
- aCbReject.Check(aChangeViewSet.IsShowRejected());
+ m_pHighlightBox->Check(aChangeViewSet.ShowChanges());
+ m_pFilterCtr->CheckDate(aChangeViewSet.HasDate());
+ m_pFilterCtr->SetFirstDate(aChangeViewSet.GetTheFirstDateTime());
+ m_pFilterCtr->SetFirstTime(aChangeViewSet.GetTheFirstDateTime());
+ m_pFilterCtr->SetLastDate(aChangeViewSet.GetTheLastDateTime());
+ m_pFilterCtr->SetLastTime(aChangeViewSet.GetTheLastDateTime());
+ m_pFilterCtr->SetDateMode((sal_uInt16)aChangeViewSet.GetTheDateMode());
+ m_pFilterCtr->CheckAuthor(aChangeViewSet.HasAuthor());
+ m_pFilterCtr->CheckComment(aChangeViewSet.HasComment());
+ m_pFilterCtr->SetComment(aChangeViewSet.GetTheComment());
+
+ m_pCbAccept->Check(aChangeViewSet.IsShowAccepted());
+ m_pCbReject->Check(aChangeViewSet.IsShowRejected());
OUString aString=aChangeViewSet.GetTheAuthorToShow();
if(!aString.isEmpty())
{
- aFilterCtr.SelectAuthor(aString);
+ m_pFilterCtr->SelectAuthor(aString);
}
else
{
- aFilterCtr.SelectedAuthorPos(0);
+ m_pFilterCtr->SelectedAuthorPos(0);
}
- aFilterCtr.CheckRange(aChangeViewSet.HasRange());
+ m_pFilterCtr->CheckRange(aChangeViewSet.HasRange());
if ( !aChangeViewSet.GetTheRangeList().empty() )
{
const ScRange* pRangeEntry = aChangeViewSet.GetTheRangeList().front();
OUString aRefStr(pRangeEntry->Format(ABS_DREF3D, pDoc));
- aFilterCtr.SetRange(aRefStr);
+ m_pFilterCtr->SetRange(aRefStr);
}
- aFilterCtr.Enable(true,true);
- HighlightHandle(&aHighlightBox);
+ m_pFilterCtr->Enable(true,true);
+ HighlightHandle(m_pHighlightBox);
}
//----------------------------------------------------------------------------
@@ -153,13 +139,13 @@ void ScHighlightChgDlg::Init()
void ScHighlightChgDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
{
- if ( aEdAssign.IsVisible() )
+ if ( m_pEdAssign->IsVisible() )
{
if ( rRef.aStart != rRef.aEnd )
- RefInputStart(&aEdAssign);
+ RefInputStart(m_pEdAssign);
OUString aRefStr(rRef.Format(ABS_DREF3D, pDocP, pDocP->GetAddressConvention()));
- aEdAssign.SetRefString( aRefStr );
- aFilterCtr.SetRange(aRefStr);
+ m_pEdAssign->SetRefString( aRefStr );
+ m_pFilterCtr->SetRange(aRefStr);
}
}
@@ -172,12 +158,12 @@ sal_Bool ScHighlightChgDlg::Close()
void ScHighlightChgDlg::RefInputDone( sal_Bool bForced)
{
ScAnyRefDlg::RefInputDone(bForced);
- if(bForced || !aRbAssign.IsVisible())
+ if(bForced || !m_pRbAssign->IsVisible())
{
- aFilterCtr.SetRange(aEdAssign.GetText());
- aFilterCtr.SetFocusToRange();
- aEdAssign.Hide();
- aRbAssign.Hide();
+ m_pFilterCtr->SetRange(m_pEdAssign->GetText());
+ m_pFilterCtr->SetFocusToRange();
+ m_pEdAssign->Hide();
+ m_pRbAssign->Hide();
}
}
@@ -187,24 +173,24 @@ void ScHighlightChgDlg::SetActive()
sal_Bool ScHighlightChgDlg::IsRefInputMode() const
{
- return aEdAssign.IsVisible();
+ return m_pEdAssign->IsVisible();
}
IMPL_LINK( ScHighlightChgDlg, HighlightHandle, CheckBox*, pCb )
{
if(pCb!=NULL)
{
- if(aHighlightBox.IsChecked())
+ if(m_pHighlightBox->IsChecked())
{
- aFilterCtr.Enable(true,true);
- aCbAccept.Enable();
- aCbReject.Enable();
+ m_pFilterCtr->Enable(true,true);
+ m_pCbAccept->Enable();
+ m_pCbReject->Enable();
}
else
{
- aFilterCtr.Disable(true);
- aCbAccept.Disable();
- aCbReject.Disable();
+ m_pFilterCtr->Disable(true);
+ m_pCbAccept->Disable();
+ m_pCbReject->Disable();
}
}
return 0;
@@ -215,38 +201,38 @@ IMPL_LINK( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef )
if(pRef!=NULL)
{
SetDispatcherLock( true );
- aEdAssign.Show();
- aRbAssign.Show();
- aEdAssign.SetText(aFilterCtr.GetRange());
- aEdAssign.GrabFocus();
- ScAnyRefDlg::RefInputStart(&aEdAssign,&aRbAssign);
+ m_pEdAssign->Show();
+ m_pRbAssign->Show();
+ m_pEdAssign->SetText(m_pFilterCtr->GetRange());
+ m_pEdAssign->GrabFocus();
+ ScAnyRefDlg::RefInputStart(m_pEdAssign, m_pRbAssign);
}
return 0;
}
IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, PushButton*, pOKBtn )
{
- if ( pOKBtn == &aOkButton)
+ if (pOKBtn == m_pOkButton)
{
- aChangeViewSet.SetShowChanges(aHighlightBox.IsChecked());
- aChangeViewSet.SetHasDate(aFilterCtr.IsDate());
- ScChgsDateMode eMode = (ScChgsDateMode) aFilterCtr.GetDateMode();
+ aChangeViewSet.SetShowChanges(m_pHighlightBox->IsChecked());
+ aChangeViewSet.SetHasDate(m_pFilterCtr->IsDate());
+ ScChgsDateMode eMode = (ScChgsDateMode) m_pFilterCtr->GetDateMode();
aChangeViewSet.SetTheDateMode( eMode );
- Date aFirstDate( aFilterCtr.GetFirstDate() );
- Time aFirstTime( aFilterCtr.GetFirstTime() );
- Date aLastDate( aFilterCtr.GetLastDate() );
- Time aLastTime( aFilterCtr.GetLastTime() );
+ Date aFirstDate( m_pFilterCtr->GetFirstDate() );
+ Time aFirstTime( m_pFilterCtr->GetFirstTime() );
+ Date aLastDate( m_pFilterCtr->GetLastDate() );
+ Time aLastTime( m_pFilterCtr->GetLastTime() );
aChangeViewSet.SetTheFirstDateTime( DateTime( aFirstDate, aFirstTime ) );
aChangeViewSet.SetTheLastDateTime( DateTime( aLastDate, aLastTime ) );
- aChangeViewSet.SetHasAuthor(aFilterCtr.IsAuthor());
- aChangeViewSet.SetTheAuthorToShow(aFilterCtr.GetSelectedAuthor());
- aChangeViewSet.SetHasRange(aFilterCtr.IsRange());
- aChangeViewSet.SetShowAccepted(aCbAccept.IsChecked());
- aChangeViewSet.SetShowRejected(aCbReject.IsChecked());
- aChangeViewSet.SetHasComment(aFilterCtr.IsComment());
- aChangeViewSet.SetTheComment(aFilterCtr.GetComment());
+ aChangeViewSet.SetHasAuthor(m_pFilterCtr->IsAuthor());
+ aChangeViewSet.SetTheAuthorToShow(m_pFilterCtr->GetSelectedAuthor());
+ aChangeViewSet.SetHasRange(m_pFilterCtr->IsRange());
+ aChangeViewSet.SetShowAccepted(m_pCbAccept->IsChecked());
+ aChangeViewSet.SetShowRejected(m_pCbReject->IsChecked());
+ aChangeViewSet.SetHasComment(m_pFilterCtr->IsComment());
+ aChangeViewSet.SetTheComment(m_pFilterCtr->GetComment());
ScRangeList aLocalRangeList;
- aLocalRangeList.Parse(aFilterCtr.GetRange(), pDoc);
+ aLocalRangeList.Parse(m_pFilterCtr->GetRange(), pDoc);
aChangeViewSet.SetTheRangeList(aLocalRangeList);
aChangeViewSet.AdjustDateMode( *pDoc );
pDoc->SetChangeViewSettings(aChangeViewSet);
diff --git a/sc/source/ui/miscdlgs/highred.src b/sc/source/ui/miscdlgs/highred.src
deleted file mode 100644
index 8ce950c..0000000
--- a/sc/source/ui/miscdlgs/highred.src
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "highred.hrc"
-ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES
-{
- OutputSize = TRUE ;
- HelpId = CMD_FID_CHG_ACCEPT ;
- Hide = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 318 , 148 ) ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- // Dieser Dialog hat einen Cancel-Button !
- CheckBox CB_HIGHLIGHT
- {
- HelpID = "sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT";
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 150 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Show changes in spreadsheet" ;
- };
- FixedLine FL_FILTER
- {
- Pos = MAP_APPFONT ( 6 , 22 ) ;
- Size = MAP_APPFONT ( 255 , 8 ) ;
- Text [ en-US ] = "Filter settings";
- };
- CheckBox CB_HIGHLIGHT_ACCEPT
- {
- HelpID = "sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT";
- Pos = MAP_APPFONT ( 12 , 118 ) ;
- Size = MAP_APPFONT ( 246 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Show ~accepted changes" ;
- };
- CheckBox CB_HIGHLIGHT_REJECT
- {
- HelpID = "sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_REJECT";
- Pos = MAP_APPFONT ( 12 , 132 ) ;
- Size = MAP_APPFONT ( 246 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Show ~rejected changes" ;
- };
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 267 , 6 ) ;
- Size = MAP_APPFONT ( 45 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 267 , 23 ) ;
- Size = MAP_APPFONT ( 45 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 267 , 43 ) ;
- Size = MAP_APPFONT ( 45 , 14 ) ;
- TabStop = TRUE ;
- };
- Edit ED_ASSIGN
- {
- HelpID = "sc:Edit:RID_SCDLG_HIGHLIGHT_CHANGES:ED_ASSIGN";
- Hide = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 119 ) ;
- Size = MAP_APPFONT ( 128 , 12 ) ;
- TabStop = TRUE ;
- };
- ImageButton RB_ASSIGN
- {
- HelpID = "sc:ImageButton:RID_SCDLG_HIGHLIGHT_CHANGES:RB_ASSIGN";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 142 , 118 ) ;
- Size = MAP_APPFONT ( 13 , 15 ) ;
- TabStop = TRUE;
- QuickHelpText [ en-US ] = "Minimize/Maximize" ;
- };
- Text [ en-US ] = "Show Changes" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/uiconfig/scalc/ui/showchangesdialog.ui b/sc/uiconfig/scalc/ui/showchangesdialog.ui
new file mode 100644
index 0000000..34d3f5b
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/showchangesdialog.ui
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkDialog" id="ShowChangesDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Show Changes</property>
+ <property name="type_hint">normal</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="showchanges">
+ <property name="label" translatable="yes">_Show changes in spreadsheet</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="showaccepted">
+ <property name="label" translatable="yes">Show _accepted changes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="showrejected">
+ <property name="label" translatable="yes">Show _rejected changes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Filter settings</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="foruilo-RefEdit" id="range">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="width_chars">35</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="foruilo-RefButton" id="rangeref">
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="no_show_all">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit 91f509fda9a04670e0752a214188be87bce1f2ac
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Tue Feb 11 10:15:45 2014 +0000
Resolves: #i124178# correct export of User Variable Input Fields
(cherry picked from commit b95fa33a4d2827adb8e16de5bae4e535d8c826c9)
Conflicts:
sw/source/core/unocore/unoportenum.cxx
Change-Id: If645dd2f02ef0e511e44615339d6403cc469c784
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 9677f7d..2b52aa6 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -839,7 +839,7 @@ lcl_ExportHints(
{
pUnoCrsr->Right(
- pAttr->GetFmtFld().GetField()->GetPar1().getLength() + 2,
+ pAttr->GetFmtFld().GetField()->ExpandField( true ).getLength() + 2,
CRSR_SKIP_CHARS,
sal_False,
sal_False );
commit 2f2111c31c0721df78b467bf5d4615d6b0ca29b3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 13:33:58 2014 +0000
coverity#1027390 Logically dead code
Change-Id: I996cc37bf95e36ca69d1809882e2d6f9a18e9411
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index e3b3b5e..aef5069 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -529,7 +529,7 @@ void LinePropertyPanel::NotifyItemUpdate(
if(pItem)
{
- mpEndItem.reset(pItem ? (XLineEndItem*)pItem->Clone() : 0);
+ mpEndItem.reset((XLineEndItem*)pItem->Clone());
SelectEndStyle(false);
break;
}
commit e36605bae4a6c85ec5f96951b802e07af7b54308
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 13:32:58 2014 +0000
coverity#1027397 Logically dead code
Change-Id: Icc53c6fc52e9920ac35b5dc82ff064b8fdf258ca
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index 5432c9b..5041702 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -1045,7 +1045,7 @@ bool Region::Intersect( const Region& rRegion )
else
{
// prepare new regionBand
- RegionBand* pNew = pCurrent ? new RegionBand(*pCurrent) : new RegionBand();
+ RegionBand* pNew = new RegionBand(*pCurrent);
// intersect with source
pNew->Intersect(*pSource);
commit 7587973b08c663489d75646e22d3daa64d19f603
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 13:29:05 2014 +0000
coverity#1103726 Dereference before null check
Change-Id: I1749ff8bbb16409f40c3148803f9ba2fc5ceadfa
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 53ea0bb..d961c81 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -243,7 +243,6 @@ handle_r1c1:
// integer. we need to clean up this code.
if( nPos < nLen && nPos > 0 &&
'-' == pChar[nPos] && '[' == pChar[nPos-1] &&
- NULL != pDoc &&
formula::FormulaGrammar::CONV_XL_R1C1 == pDoc->GetAddressConvention() )
{
nPos++;
commit 5dd3ad8163f68a7f50eb83aad8afc460fa9b03c1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 13:27:47 2014 +0000
coverity#1103730 Uncaught exception
Change-Id: Ic4fd67374ab79856e7c51010af83b8dcee33b512
diff --git a/include/canvas/base/bufferedgraphicdevicebase.hxx b/include/canvas/base/bufferedgraphicdevicebase.hxx
index 09a1590..0eec72a 100644
--- a/include/canvas/base/bufferedgraphicdevicebase.hxx
+++ b/include/canvas/base/bufferedgraphicdevicebase.hxx
@@ -117,7 +117,9 @@ namespace canvas
BaseType::maDeviceHelper.destroyBuffers();
}
- virtual ::sal_Bool SAL_CALL showBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException)
+ virtual ::sal_Bool SAL_CALL showBuffer( ::sal_Bool bUpdateAll )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception)
{
MutexType aGuard( BaseType::m_aMutex );
commit 1491cea2c73ad328ddc0b192e85748ce0c545477
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 13:26:29 2014 +0000
coverity#1103731 Uncaught exception
Change-Id: Ia56720a1dbc209b048cb9285266e8d897b37cf29
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx
index ad02eb1..93371a2 100644
--- a/canvas/source/opengl/ogl_spritecanvas.cxx
+++ b/canvas/source/opengl/ogl_spritecanvas.cxx
@@ -144,7 +144,8 @@ namespace oglcanvas
return uno::Reference< rendering::XSprite >();
}
- sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException)
+ sal_Bool SAL_CALL SpriteCanvas::updateScreen(sal_Bool bUpdateAll)
+ throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
return maDeviceHelper.showBuffer(mbIsVisible, bUpdateAll);
diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx
index f4bc534..32260b4 100644
--- a/canvas/source/opengl/ogl_spritecanvas.hxx
+++ b/canvas/source/opengl/ogl_spritecanvas.hxx
@@ -93,7 +93,9 @@ namespace oglcanvas
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > >& animationBitmaps, ::sal_Int8 interpolationMode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > SAL_CALL createCustomSprite( const ::com::sun::star::geometry::RealSize2D& spriteSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > SAL_CALL createClonedSprite( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >& original ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL updateScreen( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL updateScreen( ::sal_Bool bUpdateAll )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
// XServiceName
virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException);
commit 4fd069c41a43e3e0398e9dd44908c157db67c713
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 13:24:27 2014 +0000
coverity#1103732 Uncaught exception
Change-Id: I3585421107776969efc0888cb581c004cc2aef67
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 71f42a0..ee45dcd 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -1071,7 +1071,7 @@ namespace cmis
}
uno::Sequence< document::CmisVersion> Content::getAllVersions( const uno::Reference< ucb::XCommandEnvironment > & xEnv )
- throw( uno::Exception )
+ throw( uno::Exception, std::exception )
{
try
{
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index d34c03b..46f4578 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -121,7 +121,8 @@ private:
com::sun::star::uno::Sequence< com::sun::star::document::CmisVersion >
getAllVersions( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
- throw( com::sun::star::uno::Exception );
+ throw(com::sun::star::uno::Exception,
+ std::exception);
sal_Bool feedSink( com::sun::star::uno::Reference< com::sun::star::uno::XInterface> aSink,
const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv );
commit 0c039a2595bd741a1a785ba23b436f790e0431df
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 13:22:23 2014 +0000
coverity#738874 Uninitialized scalar field
Change-Id: I3874c74141520269b43ee3562cc8511d36a31bbd
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 6e6cf44..1d57809 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -54,10 +54,9 @@ private:
// -----------------------------------------------------------------------
ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet )
-
-: PopupMenu( ResId( RID_SVXMNU_ZOOM, DIALOG_MGR() ) ),
-
- nZoom( nZ )
+ : PopupMenu(ResId(RID_SVXMNU_ZOOM, DIALOG_MGR()))
+ , nZoom(nZ)
+ , nCurId(0)
{
static const sal_uInt16 aTable[] =
{
commit e7f887d341a187f154612480d4cd0edb36269b5a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 13:21:03 2014 +0000
coverity#738872 Uninitialized scalar field
Change-Id: I4086e4a1bb851ada73cd7eb42590e0df4cc1190e
diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx
index 035d6d1..12d7e93 100644
--- a/svx/source/dialog/imapimp.hxx
+++ b/svx/source/dialog/imapimp.hxx
@@ -35,9 +35,13 @@ public:
ImageMap aUpdateImageMap;
TargetList aUpdateTargetList;
void* pUpdateEditingObject;
- sal_Bool bExecState;
+ sal_Bool bExecState;
- IMapOwnData() : pUpdateEditingObject( NULL ) {}
+ IMapOwnData()
+ : pUpdateEditingObject(NULL)
+ , bExecState(false)
+ {
+ }
};
commit 6ca45dbb0cb137230e9b3a0ce6d719b981617d29
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 13:19:57 2014 +0000
coverity#738581 Uninitialized pointer field
Change-Id: I01738db66ffa1dc2926a84da890e803d54ced76b
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index ac9707f..bff5ad2 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -641,7 +641,8 @@ TPGalleryThemeGeneral::TPGalleryThemeGeneral( Window* pParent, const SfxItemSet&
aFtMSShowContent ( this, CUI_RES( FT_MS_SHOW_CONTENT ) ),
aFlMSGeneralSecond ( this, CUI_RES( FL_MS_GENERAL_SECOND ) ),
aFtMSChangeDate ( this, CUI_RES( FT_MS_CHANGEDATE ) ),
- aFtMSShowChangeDate ( this, CUI_RES( FT_MS_SHOW_CHANGEDATE ) )
+ aFtMSShowChangeDate ( this, CUI_RES( FT_MS_SHOW_CHANGEDATE ) ),
+ pData(NULL)
{
FreeResource();
commit 994362b3bd6d2a988e031828bfb36f1752042319
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 13:18:28 2014 +0000
coverity#737276 Uncaught exception
Change-Id: Ie1c73c4ddcf52d75ebae7d6e85f1b85fb2b644c1
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 8c0e77e..b5ec4c9 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -376,7 +376,8 @@ uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNa
}
uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Styles_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw( uno::Exception, std::exception )
{
return (cppu::OWeakObject*)new ScXMLExport(comphelper::getComponentContext(rSMgr), ScXMLOasisExport_Styles_getImplementationName(), EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS|EXPORT_OASIS);
}
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 3a24d4f..bb4fb89 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -107,7 +107,8 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Meta_createIn
extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Styles_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw( uno::Exception, std::exception );
extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Content_createInstance(
commit 7dfd6125bf0e02ca892c8cea9eb70cde73aa0bd9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 13:17:08 2014 +0000
coverity#738580 Uninitialized pointer field
Change-Id: I3b2295afa5a86430178c68e61f38a98969708f0b
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index ef4a9a4..ac9707f 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -450,6 +450,7 @@ ActualizeProgress::ActualizeProgress( Window* pWindow, GalleryTheme* pThm ) :
aFtActualizeFile ( this, CUI_RES( FT_ACTUALIZE_FILE ) ),
aFLActualizeProgress ( this, CUI_RES( FL_ACTUALIZE_PROGRESS ) ),
aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
+ pTimer(NULL),
pTheme ( pThm )
{
FreeResource();
commit 9742d413638d27315d0904f72452f8f01fb617d1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 12:52:43 2014 +0000
coverity#737275 Uncaught exception
Change-Id: I4e1b0cfc50f044b9b66b573c374254fa74607244
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index fc31813..8c0e77e 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -319,7 +319,8 @@ uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNa
}
uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw( uno::Exception, std::exception )
{
return (cppu::OWeakObject*)new ScXMLExport( comphelper::getComponentContext(rSMgr), ScXMLOOoExport_Settings_getImplementationName(), EXPORT_SETTINGS );
}
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 6687301..3a24d4f 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -92,7 +92,8 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createI
extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw( uno::Exception, std::exception );
// Calc XML Oasis export
extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw();
commit 68d9649f21e4e634737436aa96fe5b57aff5f781
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 12:51:13 2014 +0000
coverity#735822 Unchecked dynamic_cast
Change-Id: I88911159659f765e6f2c2f49d3d3e8313b2c9e8f
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index ccc9781..ad01585 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -374,6 +374,7 @@ void SdFiltersTest::testN778859()
// Get the object
SdrObject *pObj = pPage->GetObj(1);
SdrTextObj *pTxtObj = dynamic_cast<SdrTextObj *>( pObj );
+ CPPUNIT_ASSERT_MESSAGE( "no text object", pTxtObj != NULL);
CPPUNIT_ASSERT(!pTxtObj->IsAutoFit());
}
}
commit dbc2cbe4f2f5f790f0849a3ed4933cfec20aa2e3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 12:49:48 2014 +0000
coverity#735818 Dereference after null check
Change-Id: I0f2e9e5f826ca8cd9ce81a45b4610b5adf356934
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 5ab2a6e..e5d959c 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -268,8 +268,8 @@ void ScPreviewShell::UpdateNeededScrollBars( bool bFromZoom )
return;
// for centering, page size without the shadow is used
- bool bVert = pVerScroll ? pVerScroll->IsVisible() : false;
- bool bHori = pHorScroll ? pHorScroll->IsVisible() : false;
+ bool bVert = pVerScroll->IsVisible();
+ bool bHori = pHorScroll->IsVisible();
Size aWindowSize = pPreview->GetOutputSize();
Point aPos = pPreview->GetPosPixel();
Size aWindowPixelSize = pPreview->GetOutputSizePixel();
commit 4eee115824e8eec8c824f72253d86caf593e0e11
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 12:48:21 2014 +0000
coverity#708722 Uninitialized scalar field
Change-Id: I553f573914a60c77184403cdf0478cb5b442475a
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 75a856d..8f858c9 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -115,6 +115,7 @@ XMLCharContext::XMLCharContext(
SvXMLImportContext( rImp, nPrfx, rLName )
,m_nControl(nControl)
,m_nCount(0)
+ ,m_c(0)
{
}
commit d69c4535a156799544b3ff9aa7b695911909a1f7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 12:47:10 2014 +0000
coverity#708311 Uninitialized scalar field
Change-Id: I19c19f4e1ae4e8718b44f4a70992113178a6658c
diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx
index c9472bf..e486af6 100644
--- a/vcl/source/filter/FilterConfigItem.cxx
+++ b/vcl/source/filter/FilterConfigItem.cxx
@@ -152,6 +152,7 @@ FilterConfigItem::FilterConfigItem( const OUString& rSubTree )
}
FilterConfigItem::FilterConfigItem( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData )
+ : bModified(false)
{
if ( pFilterData )
aFilterData = *pFilterData;
commit 5d2d9092ea6ff04399b65bf1b0f2c3f411839d31
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 12:46:03 2014 +0000
coverity#708721 Uninitialized scalar field
Change-Id: Ief6411d08837fc7b50bdca71bd33503f8eed16b9
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index dc6c262..2728f9e 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -986,6 +986,7 @@ XMLPlaceholderFieldImportContext::XMLPlaceholderFieldImportContext(
, sPropertyPlaceholderType(sAPI_place_holder_type)
, sPropertyPlaceholder(sAPI_place_holder)
, sPropertyHint(sAPI_hint)
+, nPlaceholderType(PlaceholderType::TEXT)
{
}
commit 16e21955d2936dea4e82428e971c7f51f3088ec2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 12:44:13 2014 +0000
coverity#707953 Uninitialized scalar field
Change-Id: I7ae556a065f250774c7d0f8ca4f6f9c9c2c6c533
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 3438d2d..a373e30 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -76,6 +76,7 @@ Thesaurus::Thesaurus() :
aTLocs = NULL;
aTNames = NULL;
numthes = 0;
+ prevLocale = LANGUAGE_DONTKNOW;
}
commit feaa2f675adca31a6bcd00231ed75ffed1791165
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 12:40:54 2014 +0000
coverity#707948 Uninitialized scalar field
Change-Id: I254c5695f1a80eba8a90421da3417969b3e0e8f8
diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx
index 4cafeec..6f2d818 100644
--- a/helpcompiler/inc/HelpLinker.hxx
+++ b/helpcompiler/inc/HelpLinker.hxx
@@ -53,16 +53,18 @@ public:
std::string* pExtensionPath = NULL,
std::string* pDestination = NULL,
const OUString* pOfficeHelpPath = NULL )
-
throw( HelpProcessingException );
HelpLinker()
- : m_pIndexerPreProcessor(NULL)
+ : bExtensionMode(false)
+ , m_pIndexerPreProcessor(NULL)
, m_bUseLangRoot(true)
, m_bCreateIndex(true)
{}
~HelpLinker()
- { delete m_pIndexerPreProcessor; }
+ {
+ delete m_pIndexerPreProcessor;
+ }
private:
Stringtable additionalFiles;
commit a0d5d57386f4c5ebf940d77b490b987c63a36c07
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 12:37:16 2014 +0000
coverity#707930 Uninitialized scalar field
Change-Id: Ib652a8a1f81dde1f5ac3b6b7b73376c73777247c
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index ee3ba12..6a29ef5 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -56,24 +56,31 @@ friend class SvStringHashTable;
sal_uLong nValue;
sal_Bool bHasId;
public:
- SvStringHashEntry() : bHasId( sal_False ) {;}
- SvStringHashEntry( const OString& rName, sal_uInt32 nIdx )
- : aName( rName )
- , nHashId( nIdx )
- , nValue( 0 )
- , bHasId( sal_True ) {}
- ~SvStringHashEntry();
-
- const OString& GetName() const { return aName; }
- sal_Bool HasId() const { return bHasId; }
- sal_uInt32 GetId() const { return nHashId; }
+ SvStringHashEntry()
+ : nHashId(0)
+ , nValue(0)
+ , bHasId(false)
+ {
+ }
+ SvStringHashEntry( const OString& rName, sal_uInt32 nIdx )
+ : aName(rName)
+ , nHashId(nIdx)
+ , nValue(0)
+ , bHasId(true)
+ {
+ }
+ ~SvStringHashEntry();
+
+ const OString& GetName() const { return aName; }
+ sal_Bool HasId() const { return bHasId; }
+ sal_uInt32 GetId() const { return nHashId; }
void SetValue( sal_uLong n ) { nValue = n; }
sal_uLong GetValue() const { return nValue; }
- sal_Bool operator == ( const SvStringHashEntry & rRef )
+ sal_Bool operator == ( const SvStringHashEntry & rRef )
{ return nHashId == rRef.nHashId; }
- sal_Bool operator != ( const SvStringHashEntry & rRef )
+ sal_Bool operator != ( const SvStringHashEntry & rRef )
{ return ! operator == ( rRef ); }
SvStringHashEntry & operator = ( const SvStringHashEntry & rRef )
{ SvRefBase::operator=( rRef );
commit ea334ca0c99dfb79c4535197335f69278cd68cfc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 12:35:13 2014 +0000
coverity#707928 Uninitialized scalar field
Change-Id: I14d95bc5aee9a79a7fd6f6f41d6a6b21fb2ebf97
diff --git a/include/i18nutil/casefolding.hxx b/include/i18nutil/casefolding.hxx
index 0bf2857..a63a150 100644
--- a/include/i18nutil/casefolding.hxx
+++ b/include/i18nutil/casefolding.hxx
@@ -58,7 +58,11 @@ struct Mapping
struct MappingElement
{
- MappingElement() {element.nmap = current = 0;}
+ MappingElement()
+ : current(0)
+ {
+ element.type = element.nmap = 0;
+ }
Mapping element;
sal_Int8 current;
};
commit d3ef7f5e3fc2b650020c290386749422bfc07666
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 12:32:24 2014 +0000
coverity#707927 Uninitialized pointer field
Change-Id: I5011c4dfea02c8fab8ca3ee08bbed7f31396e3ec
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index 42f91bf..7be157b 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -40,7 +40,7 @@ class TextConversion: public cppu::WeakImplHelper2
>
{
public:
- TextConversion();
+ TextConversion(const char* pImplName);
~TextConversion();
// Methods
virtual com::sun::star::i18n::TextConversionResult SAL_CALL
@@ -81,8 +81,9 @@ public:
com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( com::sun::star::uno::RuntimeException );
-protected :
+private:
const sal_Char* implementationName;
+protected :
#ifndef DISABLE_DYNLOADING
oslModule hModule;
oslGenericFunction SAL_CALL getFunctionBySymbol(const sal_Char* func);
diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx
index fbde6f1..2f44cf2 100644
--- a/i18npool/source/textconversion/textconversion.cxx
+++ b/i18npool/source/textconversion/textconversion.cxx
@@ -31,7 +31,8 @@ extern "C" { static void SAL_CALL thisModule() {} }
#endif
-TextConversion::TextConversion()
+TextConversion::TextConversion(const char *pImplName)
+ : implementationName(pImplName)
{
#ifndef DISABLE_DYNLOADING
#ifdef SAL_DLLPREFIX
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx
index 617ff29..2fcc9f7 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -40,6 +40,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
#define SCRIPT_HANGUL 2
TextConversion_ko::TextConversion_ko( const Reference < XComponentContext >& xContext )
+ : TextConversion("com.sun.star.i18n.TextConversion_ko")
{
Reference < XInterface > xI;
@@ -76,8 +77,6 @@ TextConversion_ko::TextConversion_ko( const Reference < XComponentContext >& xCo
maxLeftLength = xCD->getMaxCharCount(ConversionDirection_FROM_LEFT);
maxRightLength = xCD->getMaxCharCount(ConversionDirection_FROM_RIGHT);
}
-
- implementationName = "com.sun.star.i18n.TextConversion_ko";
}
sal_Int16 SAL_CALL checkScriptType(sal_Unicode c)
diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx
index 1cbd3b3..8db1118 100644
--- a/i18npool/source/textconversion/textconversion_zh.cxx
+++ b/i18npool/source/textconversion/textconversion_zh.cxx
@@ -36,10 +36,9 @@ using namespace com::sun::star::uno;
namespace com { namespace sun { namespace star { namespace i18n {
TextConversion_zh::TextConversion_zh( const Reference < XComponentContext >& xContext )
+ : TextConversion("com.sun.star.i18n.TextConversion_zh")
{
xCDL = ConversionDictionaryList::create(xContext);
-
- implementationName = "com.sun.star.i18n.TextConversion_zh";
}
sal_Unicode SAL_CALL getOneCharConversion(sal_Unicode ch, const sal_Unicode* Data, const sal_uInt16* Index)
commit 83e979f61b02373fc0d624a96347acfad3c64e24
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 12:29:03 2014 +0000
coverity#707926 Uninitialized scalar field
Change-Id: Ib6dc7e409d89e4824b373db2cd7a13449c3c18ed
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index 0749a1c..c9ccc13 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -199,7 +199,6 @@ public: // ExtendedDocumentHandler
stack<LocaleNode *> currentNode ;
- sal_Bool fElement ;
LocaleNode * rootNode;
virtual void SAL_CALL startDocument(void) throw (SAXException, RuntimeException)
More information about the Libreoffice-commits
mailing list