5 files changed, 8 insertions, 134 deletions
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index d287a8e74e6c..fe6f8e0a2930 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -68,14 +68,14 @@
 #include "annotationmanager.hxx"
 #include "annotationmanagerimpl.hxx"
 #include "annotationwindow.hxx"
-#include "annotations.hrc"
+#include "strings.hrc"
 
 #include "Annotation.hxx"
 #include "ToolBarManager.hxx"
 #include "DrawDocShell.hxx"
 #include "DrawViewShell.hxx"
 #include "DrawController.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdresid.hxx"
 #include "EventMultiplexer.hxx"
 #include "ViewShellManager.hxx"
@@ -831,15 +831,15 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
 
         // The question text depends on the search direction.
         bool bImpress = mpDoc->GetDocumentType() == DocumentType::Impress;
-        sal_uInt16 nStringId;
+        const char* pStringId;
         if(bForeward)
-            nStringId = bImpress ? STR_ANNOTATION_WRAP_FORWARD : STR_ANNOTATION_WRAP_FORWARD_DRAW;
+            pStringId = bImpress ? STR_ANNOTATION_WRAP_FORWARD : STR_ANNOTATION_WRAP_FORWARD_DRAW;
         else
-            nStringId = bImpress ? STR_ANNOTATION_WRAP_BACKWARD : STR_ANNOTATION_WRAP_BACKWARD_DRAW;
+            pStringId = bImpress ? STR_ANNOTATION_WRAP_BACKWARD : STR_ANNOTATION_WRAP_BACKWARD_DRAW;
 
         // Pop up question box that asks the user whether to wrap around.
         // The dialog is made modal with respect to the whole application.
-        ScopedVclPtrInstance< QueryBox > aQuestionBox( nullptr, (WB_YES_NO | WB_DEF_YES), SdResId(nStringId));
+        ScopedVclPtrInstance< QueryBox > aQuestionBox( nullptr, (WB_YES_NO | WB_DEF_YES), SdResId(pStringId));
         aQuestionBox->SetImage( QueryBox::GetStandardImage() );
         if (aQuestionBox->Execute() != RET_YES)
             break;
diff --git a/sd/source/ui/annotations/annotations.hrc b/sd/source/ui/annotations/annotations.hrc
deleted file mode 100644
index b14a1139552f..000000000000
--- a/sd/source/ui/annotations/annotations.hrc
+++ /dev/null
@@ -1,41 +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 .
- */
-
-#ifndef INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONS_HRC
-#define INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONS_HRC
-
-#include "glob.hrc"
-
-// strings
-#define STR_ANNOTATION_TODAY                (RID_ANNOTATIONS_START+1)
-#define STR_ANNOTATION_YESTERDAY            (RID_ANNOTATIONS_START+2)
-#define STR_ANNOTATION_NOAUTHOR             (RID_ANNOTATIONS_START+3)
-#define STR_ANNOTATION_WRAP_FORWARD         (RID_ANNOTATIONS_START+4)
-#define STR_ANNOTATION_WRAP_BACKWARD        (RID_ANNOTATIONS_START+5)
-#define STR_ANNOTATION_WRAP_FORWARD_DRAW    (RID_ANNOTATIONS_START+6)
-#define STR_ANNOTATION_WRAP_BACKWARD_DRAW   (RID_ANNOTATIONS_START+7)
-#define STR_ANNOTATION_UNDO_INSERT          (RID_ANNOTATIONS_START+8)
-#define STR_ANNOTATION_UNDO_DELETE          (RID_ANNOTATIONS_START+9)
-#define STR_ANNOTATION_UNDO_MOVE            (RID_ANNOTATIONS_START+10)
-#define STR_ANNOTATION_UNDO_EDIT            (RID_ANNOTATIONS_START+11)
-#define STR_ANNOTATION_REPLY                (RID_ANNOTATIONS_START+13)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/annotations/annotations.src b/sd/source/ui/annotations/annotations.src
deleted file mode 100644
index 05bfe4820d44..000000000000
--- a/sd/source/ui/annotations/annotations.src
+++ /dev/null
@@ -1,85 +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 "annotations.hrc"
-#include "glob.hrc"
-#include <svx/svxids.hrc>
-#include "helpids.h"
-
-String STR_ANNOTATION_TODAY
-{
-    Text [ en-US ] = "Today," ;
-};
-
-String STR_ANNOTATION_YESTERDAY
-{
-    Text [ en-US ] = "Yesterday," ;
-};
-
-String STR_ANNOTATION_NOAUTHOR
-{
-    Text [ en-US ] = "(no author)" ;
-};
-
-String STR_ANNOTATION_WRAP_FORWARD
-{
-    Text [ en-US ] = "%PRODUCTNAME Impress reached the end of the presentation. Do you want to continue at the beginning?";
-};
-
-String STR_ANNOTATION_WRAP_BACKWARD
-{
-    Text [ en-US ] = "%PRODUCTNAME Impress reached the beginning of the presentation. Do you want to continue at the end?";
-};
-
-String STR_ANNOTATION_WRAP_FORWARD_DRAW
-{
-    Text [ en-US ] = "%PRODUCTNAME Draw reached the end of the document. Do you want to continue at the beginning?";
-};
-
-String STR_ANNOTATION_WRAP_BACKWARD_DRAW
-{
-    Text [ en-US ] = "%PRODUCTNAME Draw reached the beginning of the document. Do you want to continue at the end?";
-};
-
-String STR_ANNOTATION_UNDO_INSERT
-{
-    Text [ en-US ] = "Insert Comment";
-};
-
-String STR_ANNOTATION_UNDO_DELETE
-{
-    Text [ en-US ] = "Delete Comment(s)";
-};
-
-String STR_ANNOTATION_UNDO_MOVE
-{
-    Text [ en-US ] = "Move Comment";
-};
-
-String STR_ANNOTATION_UNDO_EDIT
-{
-    Text [ en-US ] = "Edit Comment";
-};
-
-String STR_ANNOTATION_REPLY
-{
-    Text [ en-US ] = "Reply to %1" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 00fddda8a313..659141df6968 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -36,7 +36,7 @@
 
 #include "View.hxx"
 #include "sdresid.hxx"
-#include "annotations.hrc"
+#include "strings.hrc"
 #include "annotationmanagerimpl.hxx"
 #include "annotationwindow.hxx"
 #include "annotationtag.hxx"
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index e3c30d990109..7b2349ac2493 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -73,7 +73,7 @@
 #include <basegfx/tuple/b2dtuple.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
-#include "annotations.hrc"
+#include "strings.hrc"
 #include "annotationwindow.hxx"
 #include "annotationmanagerimpl.hxx"