cui/source/tabpages/autocdlg.cxx | 2 +-
sw/inc/comcore.hrc | 2 +-
sw/source/ui/app/app.src | 7 -------
sw/source/ui/uiview/view2.cxx | 20 ++++++++++----------
4 files changed, 12 insertions(+), 19 deletions(-)
New commits:
commit e21544132a6732334a14194e02232b28e559303b
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jul 1 10:38:51 2013 +0100
Resolves: fdo#66403 infinite loop, typo i should be it
Change-Id: Ia3ec1302649809b7a63befc0a48fb142f1169936
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 5a97a91..9efb438 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1434,7 +1434,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet&
)
}
}
- for(std::vector<OUString>::iterator it =
rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end(); ++i)
+ for(std::vector<OUString>::iterator it =
rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end();
++it)
{
String* s = new String(*it);
if(!pWrdList->insert(s).second)
commit 6d866fec7117b5264136371bd8c04d5b882548e9
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jul 1 08:55:36 2013 +0100
fix indent
Change-Id: I079e88700f3353b906f0d8fc85083695cfe569bb
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index f490aab..7f3ab45 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -2293,16 +2293,16 @@ void SwView::GenerateFormLetter(sal_Bool
bUseCurrentDocument)
else
{
//take an existing data source or create a new one?
- SwAbstractDialogFactory* pFact =
SwAbstractDialogFactory::Create();
- OSL_ENSURE(pFact, "Dialogdiet fail!");
- AbstractMailMergeFieldConnectionsDlg* pConnectionsDlg =
pFact->CreateMailMergeFieldConnectionsDlg(
-
DLG_MERGE_FIELD_CONNECTIONS,
-
&GetViewFrame()->GetWindow());
- OSL_ENSURE(pConnectionsDlg, "Dialogdiet fail!");
- if(RET_OK == pConnectionsDlg->Execute())
- bCallAddressPilot =
!pConnectionsDlg->IsUseExistingConnections();
- else
- return;
+ SwAbstractDialogFactory* pFact =
SwAbstractDialogFactory::Create();
+ OSL_ENSURE(pFact, "Dialogdiet fail!");
+ AbstractMailMergeFieldConnectionsDlg* pConnectionsDlg =
pFact->CreateMailMergeFieldConnectionsDlg(
+
DLG_MERGE_FIELD_CONNECTIONS,
+
&GetViewFrame()->GetWindow());
+ OSL_ENSURE(pConnectionsDlg, "Dialogdiet fail!");
+ if(RET_OK == pConnectionsDlg->Execute())
+ bCallAddressPilot =
!pConnectionsDlg->IsUseExistingConnections();
+ else
+ return;
}
if(bCallAddressPilot)
commit f9acc916bf6a047e92692e91623113806d2c1a29
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jul 1 08:54:38 2013 +0100
MSG_DISABLE_UNDO_QUESTION unused
Change-Id: I1e06ccae6c820715d2cea70d679bf7681bae711a
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index 21e1d7e..eb1b3e2 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -42,7 +42,7 @@
#define STR_MULT_INTERACT_SPELL_WARN (RC_COMCORE_BEGIN + 14)
#define STR_SPELL_TITLE (RC_COMCORE_BEGIN + 15)
#define STR_HYPH_TITLE (RC_COMCORE_BEGIN + 16)
-#define MSG_DISABLE_UNDO_QUESTION (RC_COMCORE_BEGIN + 17)
+
#define STR_REDLINE_INSERT (RC_COMCORE_BEGIN + 19)
#define STR_REDLINE_DELETE (RC_COMCORE_BEGIN + 20)
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index d18ee58..34a6bc5 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -502,13 +502,6 @@ String STR_REDLINE_UNKNOWN_AUTHOR
Text [ en-US ] = "Unknown Author";
};
-WarningBox MSG_DISABLE_UNDO_QUESTION
-{
- BUTTONS = WB_YES_NO_CANCEL;
- DEFBUTTON = WB_DEF_YES ;
- Message [ en-US ] = "This action deletes the list of actions that can be
undone. Previous changes made to the document are still valid, but cannot be
undone. Do you want to continue formatting?";
-};
-
QueryBox MSG_PRINT_AS_MERGE
{
HelpId = HID_PRINT_AS_MERGE;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
