summaryrefslogtreecommitdiff
path: root/avmedia/source/viewer
diff options
context:
space:
mode:
Diffstat (limited to 'avmedia/source/viewer')
-rw-r--r--avmedia/source/viewer/mediawindow.cxx2
-rw-r--r--avmedia/source/viewer/mediawindow.hrc26
-rw-r--r--avmedia/source/viewer/mediawindow.src47
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx2
4 files changed, 2 insertions, 75 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 8145cea56b32..62fd5ee9349e 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -21,7 +21,7 @@
#include "mediawindow_impl.hxx"
#include "mediamisc.hxx"
#include "bitmaps.hlst"
-#include "mediawindow.hrc"
+#include "strings.hrc"
#include <tools/urlobj.hxx>
#include <vcl/layout.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/avmedia/source/viewer/mediawindow.hrc b/avmedia/source/viewer/mediawindow.hrc
deleted file mode 100644
index b4ec26c6e357..000000000000
--- a/avmedia/source/viewer/mediawindow.hrc
+++ /dev/null
@@ -1,26 +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 .
- */
-
-#define AVMEDIA_STR_OPENMEDIA_DLG 16384
-#define AVMEDIA_STR_INSERTMEDIA_DLG 16385
-#define AVMEDIA_STR_ALL_MEDIAFILES 16386
-#define AVMEDIA_STR_ALL_FILES 16387
-#define AVMEDIA_STR_ERR_URL 16388
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src
deleted file mode 100644
index 9c753a6f5b57..000000000000
--- a/avmedia/source/viewer/mediawindow.src
+++ /dev/null
@@ -1,47 +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 "mediawindow.hrc"
-
-String AVMEDIA_STR_INSERTMEDIA_DLG
-{
- Text[en-US] = "Insert Audio or Video";
-};
-
-String AVMEDIA_STR_OPENMEDIA_DLG
-{
- Text[en-US] = "Open Audio or Video";
-};
-
-String AVMEDIA_STR_ALL_MEDIAFILES
-{
- Text[en-US] = "All audio and video files";
-};
-
-String AVMEDIA_STR_ALL_FILES
-{
- Text[en-US] = "All files";
-};
-
-String AVMEDIA_STR_ERR_URL
-{
- Text[en-US] = "The format of the selected file is not supported.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index d362a5b7e0c0..13eb6626774f 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -23,8 +23,8 @@
#include "mediawindow_impl.hxx"
#include "mediaevent_impl.hxx"
#include "mediamisc.hxx"
+#include "strings.hrc"
#include "bitmaps.hlst"
-#include "mediawindow.hrc"
#include "helpids.hrc"
#include <algorithm>